Return Bluetooth to AOSP

Change-Id: Iab60ed99abc0c76775b5b8fc4fe4f33d2d3d2c6b