vs985: de-commonize thermal-engine config

Change-Id: Id2555cd919c0aba80cdb3d536b96d8a635920ccf