Merge branch 'android-4.4' of https://github.com/AOSB/android_frameworks_base into aosb-kk