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

Change-Id: I879aea49003eaf3ab65c4d40149e2b61922f1e98