Merge tag 'android-4.3_r3.1' of https://android.googlesource.com/plat…
…form/frameworks/base into Orca 3

Android 4.3 Release 3.1