Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1

Conflicts:
	include/hardware/power.h

Change-Id: I11e169c670873eea38833665b2dd3951d3c9296c
Revert "Remove remnants of HWC 0.x"

This reverts commit 71b9c1fab92727b1463226681d7bd61aac85291b.