d851: de-commonize thermal-engine config

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