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

Change-Id: I6aea107b5bd522e871cc97f965da0317edfc3c8c