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

Change-Id: I002e9ef05e3fa91b6430b1d31bc3178e87b097d0