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

Change-Id: I8baa886dfa58f6dfc918576c85df5a817d1c1451