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

Change-Id: Ic02b634d1e77f2ae73b68b625e4cc9fb2cff8706