Revert "Fix build error"

This reverts commit 1b03cf9b09dd02616f478808414f8030b4582931.
Revert "intelli/msm_thermal: initial coding for Qualcomm S4 Pro devices"

This reverts commit 0b1a9957070f53616be06ada4785ddc5a1b7fbf5.
Revert "Enable intellithermal (thanks faux123)"

This reverts commit c62a264b48dcadfc71b0a920669ec172e06e385a.
Merge branch 'jb-mr1' into jb-mr1-exp