Merge "MediaCodecInfo: do not alter performance points for 32-bit processes"