Revert "Merge commit 'refs/changes/03/803/1' of https://review.carbonrom.org/CarbonDev/android_frameworks_base into kk"

This reverts commit ef179c7aaede3b55a4d8fa44c18c250811bf99b1, reversing
changes made to 3c0a0d56e334f0fba1ee85d65109ee388adb58cb.