cleanup headers after kernel include changes

Change-Id: Idcc2ff72adb48dcf1acda1803f1c2542eaa2b0b2
Merge branch 'jb-mv' of git://github.com/Mustaavalkosta/android_device_htc_msm7x30-common into cm-10.1