Merge tag 'android-4.3_r2.1' of https://android.googlesource.com/platform/hardware/libhardware into sm-jb-mr2

Android 4.3 release 2.1

Signed-off-by: Paul Beeler <sparksco@gmail.com>

Conflicts:
	include/hardware/power.h