Revert to android-4.3_r1