Revert to branch android-4.3_r1