Merge "MediaCodecInfo: limit resolution to 4K for 32-bit processes"