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

This reverts commit 1b9366dae3e44065337a59105052db6b41f4f43f, reversing
changes made to 7feee8a907d3b0ea7b0bed55d711484f72bd75c9.