Revert "Merge commit 'refs/changes/90/890/3' of https://review.carbonrom.org/CarbonDev/android_frameworks_base into kk"

This reverts commit 06fd7593076f191815bfed18464cfdcdba18a380, reversing
changes made to 911b07ef459aae085b5f80d7aedc34445fa98b94.