Revert Merge remote-tracking branch 'Google/master' into kk4.4

Conflicts:
	btif/src/btif_util.c
	gki/Android.mk

Change-Id: Ic4554c97f7ff7ed56e806e8076ebfd1875fcf7b5 (reverted from commit d19d9f473abf3f7042bad1f6b89c6baec2a37509)