am a7ee956e: am b69b7d7f: Merge "Fix recovery image build for 32p"

* commit 'a7ee956e9dc20fa5a01606b473b18b0c3980762f':
  Fix recovery image build for 32p