Merge "MediaCodecInfo: Change default alignment and block size to 1x1" into main