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

Change-Id: I660a6bf63940d5702e8c71e3a7387604470e343f