Revert "Several updates from CM's msm8930-common kernel"

This reverts commit 3dc46b0dd37e2b7c90f99c576845d6d6000cd414.