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

* commit '34fa6d3891aceef6af910f114310cec17e13b372':