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

This reverts commit 819527afca232fc24facc5912000ce502d49c3c5, reversing
changes made to 20d37f6bb75d8f4d987b1784a6068de94c4b02f9.