Merge change I9a1ed7e4 into eclair

* changes:
  Update to reflect new priorities for A2DP profile. DO NOT MERGE.