Merge "Remove hw_module_t dependency in Bluetooth (2/3)" am: 481f65c913 am: a516b63f87 am: 3bc4556b23
am: 0a1fd44e1e  -s ours

Change-Id: I067e134b651c19e2fe0c00f6cbe98193c56658bc