Revert "Update upstream tags to android-4.3_r2.2"

This reverts commit 340a6db87991b1fed2acb523e6ac0181c2a403fc.