Squash 4.3 changes.

PS2
  Fix derp

Conflicts:
	bluedroid_wilink/Android.mk

Change-Id: I2edb481ba2ea63beb61892a4cea2bf1b5b9db0f4