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

This reverts commit 897c1f285e4a3aec45cf4fc09d930dbc659dca0f, reversing
changes made to 1b9366dae3e44065337a59105052db6b41f4f43f.