Merge "A2DP offload: switch to new properties + swap audio XML files"
am: 80236d253e

Change-Id: Ie6041cf330e0fd3b999dab5a7e7987d1d1290252