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

Android 4.3 release 2.2

Change-Id: I8d5bd15b3a206034241d52d497306f447f756d4c