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

Android 4.3 Release 3.1

Change-Id: Id980378cb850c329229f4e458035a14226a84bf1
Fix merge from android-4.3_r3.1

Change-Id: I8918574a6eb71502db1e79e3f1c862db715989d5