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

Change-Id: I391a22ce4f2f5e11712ada4016b5193dfd4cb224