Resolve final android-4.2.2_r1 branch merge conflicts