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

Change-Id: I138db10a9b56b7f8ed4836bfe602fa6805497087