Merge "Integration of the aptX and aptX-HD codecs for A2DP source" am: 5242acbd0b am: a750c90ac1 am: 5aaa985e97
am: 546866988a

Change-Id: Id2eb6fc928098fffdf1be85bc708efa8a1b7a339