BT files from AOSP

Conflicts:

	src/com/android/settings/bluetooth/CachedBluetoothDevice.java
BT fix