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

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