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

This reverts commit fc6071dd0952eb2a732dc1e9f345a66ce52abf00, reversing
changes made to 897c1f285e4a3aec45cf4fc09d930dbc659dca0f.