Update upstream tags to android-4.3_r2.2