Merge "Define EXTRA_AUDIO_CODEC_TYPE in Connection" am: d154c93041
am: 5cc86edf81

Change-Id: Ia4135eed10dcd2de431546ebe9171e950eb9eef9