Something's not right in Narnia

This build barrier isn't working, serrano and jf/d2 devices are not
inheriting the thermal files AT ALL, and it would never do what it's
supposed to do anyway if the inheritance order in msm8960-common were
fixed to accomodate it, since htle explicitly calls msm8960-common

Change-Id: Id3dfd645c12778a9ed321dc633745e05c6c281c5
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0