Merge "Integration of the AAC codec for A2DP source" am: 6a153ac4aa am: a53cc5068d
am: e3fc5f7b56

Change-Id: I69b7cef21d953bcecd2fb73ddbc1b6231c4eb25b