Merge "thermal-hal: Add CPU, GPU, bcl sensors for khaje"