Merge "Merge "Fixed the HCI ACL Header definitions for PB and BC Flags" into oc-dev am: ad6b1eb846 am: 6138bbeafb" into oc-dr1-dev-plus-aosp