Revert "Merge Faux thermald.conf"

This reverts commit e5ee22f616e63dbba8164552d84711d3513eef48.