Merge "Integration of the aptX and aptX-HD codecs for A2DP source" am: 5242acbd am: a750c90a am: 5aaa985e am: 54686698 Change-Id: Id2eb6fc928098fffdf1be85bc708efa8a1b7a339