General updates for android-4.2_r2.1