Merge "Define EXTRA_AUDIO_CODEC_TYPE in Connection"
am: d154c93041

Change-Id: I55239cc3f7e450a49f4d1402c41f625fb59421c8