Revert "Hand-merge some of CM's recent changes."

This reverts commit 61aea007c1c39e588a09074c5cf32088a7591138.
Merge branch 'pac-4.4a' of github.com:AD5GB/android_kernel_samsung_msm8660-common into pac-4.4a