Merge "Integration of the AAC codec for A2DP source" am: 22f97c83fb am: f23e80bb9b
am: d364208388

Change-Id: Ice6067732c4a94d30410a8f90cbea51b869539eb