merge tags 'android-4.2.2_r1' into jb-4.2

also included is changes pulled from cm/cm-10.1

Signed-off-by: travp624 <travp624@gmail.com>