Merge "Fix build by adding bt_types to bluetooth.h (2/2)"