Revert "Merge commit 'refs/changes/89/889/2' of https://review.carbonrom.org/CarbonDev/android_frameworks_base into kk"

This reverts commit 911b07ef459aae085b5f80d7aedc34445fa98b94, reversing
changes made to cfb45b3549d81d05b263e48ce83ae57b85f7557c.