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

This reverts commit 3c0a0d56e334f0fba1ee85d65109ee388adb58cb, reversing
changes made to 54ca2df864a2111b4baf7c7588e3304eec9416c7.