Merge tag 'android-4.4.4_r2' into android-4.4

Android 4.4.4 Release 2
Merge branch 'android-4.4' of https://github.com/MerkMod/android_frameworks_base into android-4.4