root: Revert back to old thermald, add proper symlink

Change-Id: Ibb553dc56da0cec87c7908f4fa73363707f46459
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2