am cdce7f7e: am c43b17f0: Merge "Fix recovery image build for 32p"

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