Revert "Merge commit 'refs/changes/50/450/2' of https://review.carbonrom.org/CarbonDev/android_frameworks_base into kitkat"

This reverts commit acd3630be8f9d338a1f54e56d3ca26392287ac63, reversing
changes made to 8fff0d7cc5e47dad9ee057a5155c526cc7bfba0b.