Update aosp_4.2.diff