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

Android 4.3 release 2.1
Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_external_stlport into cm-10.2