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

Change-Id: Id283755b29a3f2c6e922a076531da0cd57d4d685