Merge "MediaCodec: unify KEY_MAX_OUTPUT_CHANNEL_COUNT and AAC variant" into sc-v2-dev