Merge "Label gpuclk as sysfs_thermal file and add perms."