Merge commit 'f12f744' into HEAD
Merge commit '25f0eb884d66f7eb0d16953fe3f54f96df544e28' into jb-mr1-dev-plus-aosp
Merge commit '8a77d871a2c7038915d528bcfbc360ef69b6eea0' into master
Merge tag 'android-4.3_r2.1' into jellybean-mr2.1

Android 4.3 release 2.1