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

* commit '2496489cb4ec75f13b0d30f580332e74bf4a2fa8':
  Fix recovery image build.