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

Change-Id: Ib47915bc6839dffa1f0e5d84965799f17326dd69