Track android 4.3 r3.1 from AOSP
Merge branch 'jb3' of git://github.com/LiquidSmooth/android into jb3