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

Change-Id: Ie604039589f880d5a48e2ebce64473a626726e61