am 8fa0007a: (-s ours) am a9390df6: am 06689dc5: Merge "Fix recovery image build."

* commit '8fa0007a3eb59174f7c2fbf40a2a972dfb344531':