Squash 4.3 chnages.

Conflicts:
	include/hardware/power.h

Change-Id: Id14aedddc7b82b073520ee55ddd9ade0d9fdec25