Merge "Integration of the AAC codec for A2DP source"
am: 314f08379f

Change-Id: I64efc3565d1b6e6f69ed9a35a0fbdcd9c97faffb