bluetooth: sync with upstream and make PBAP complie

Change-Id: I4186b5fa0bf843eecf8c06eb35f86b251eac66ae