Merge tag 'android-4.4.2_r1' into HEAD

Android 4.4.2 Release 1
Merge branch 'cm' into HEAD