Update to refs/tags/android-4.3_r2.1