Merge "Fix recovery image build for 32p"