Update upstream tags to android-4.3_r2.2

Change-Id: I1654fdf2a2208086ed20f4b154807d44887b7394