Update AOSP tracking to 4.2.2_r1