Track android-4.3.1 r1 upstream from AOSP