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

This reverts commit ad8d15ab90963ee811ffa1721fa754dd9ebf28d5, reversing
changes made to ef179c7aaede3b55a4d8fa44c18c250811bf99b1.