Merge tag 'android-4.3_r2.2' of https://android.googlesource.com/platform/frameworks/native into cm-10.2

Android 4.3 release 2.2

Change-Id: If9463fdc227b5fc97450a3ba94da815af6d9e657
Merge remote-tracking branch 'cm/cm-10.2' into HEAD

Conflicts:
	services/sensorservice/SensorService.cpp

Change-Id: I0ada011496603aeed539d5b2b2b857200a8d2c56