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

Change-Id: I1ef73d7f11e244d77293a9b8b9c747ee79498819