Revert "Merge branch 'kitkat' of github.com:AOSPA/android_frameworks_base into kitkat-remix"

This reverts commit 6c0e9371d85131db64911904a6575647a9d16f66.