Merge branch 'kitkat' of github.com:AOSPA/android_frameworks_base into kitkat