Update for android 4.2.2_r1

Change-Id: Iea6df8b552fce1db11a820fb6823f36449d44adb