am a9390df6: am 06689dc5: Merge "Fix recovery image build."

* commit 'a9390df6c6b8d6cc98b102aeffc8e7acd300c857':
  Fix recovery image build.