Merge "a2dp: Remove unused macros"