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

This reverts commit 7feee8a907d3b0ea7b0bed55d711484f72bd75c9, reversing
changes made to ad8d15ab90963ee811ffa1721fa754dd9ebf28d5.