jflte: update thermald/thermal-engine configs

Change-Id: Ib0f3635a2db38b9454242e490a198efed3208c2c
Revert: jf: fix race condition at boot

Seems to be fixed to work properly now

Change-Id: Ib577525ef1b1b6ef06872891aa1807df13f67878
jflte: Fix merge failures

Change-Id: I079e8763da777d94bca4b3d66a5171c943b6c223