Merge "Integration of the AAC codec for A2DP source" am: 22f97c83fb am: f23e80bb9b am: d364208388
am: 78798cc13d

Change-Id: Ic645f9ee2eb090fc805a25a1449642dad021db4e