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

Android 4.3 Release 3.1

Change-Id: Iaa694ac1880e2eaa8c5eb23bf81df1f6c26704b2