Merge "MediaFormat: deprecate KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT" into tm-dev