Android n mr1 preview 2
Merge "Move sysfs_thermal definition to global policy."