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

Change-Id: I0f112ef179e78afca1a3659ed450bac5fedd2ad2