Merge "Fix build by adding bt_types to bluetooth.h (2/2)" am: 7de0e9ceae am: 4a38e2b53a am: e436ddf0fc am: ecb68a0983
am: e9c2b4bdbe

Change-Id: I964935ff7c08060a880d888f26c7cdb7886d6f0b