Merge "Integration of the aptX and aptX-HD codecs for A2DP source" am: 0184b42499
am: 4122ca2593

Change-Id: Id6fae01022be55f9df1fd07554a6698cf2af4a11