Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1

Change-Id: I71ad49869eef0f9e77917b54705620f363d21157
merge CyanogenMod

Change-Id: Icd2e9d60d785ae4d4027b41ca6b29184f65c6d11