Squash 4.3 changes.

Conflicts:
	device.mk

Change-Id: I1f71dc67a23bd003be8ce6e44e09b93320db6327