Squash 4.3 changes.

Signed-off-by: scotthartbti <scott@ubuntu.com>

Conflicts:
	jni/com_android_bluetooth_btservice_AdapterService.cpp

Change-Id: I314e029d21206054a7055bc905a3217f1c169282

Conflicts:
	jni/com_android_bluetooth_btservice_AdapterService.cpp