Updated Android 4.2.1 code released into AOSP