Merge "Fixed the HCI ACL Header definitions for PB and BC Flags am: 0bb581fb96  -s ours am: 98725f7c05  -s ours" into oc-mr1-dev