Merge "primary-hal: BT a2dp build error fix"