Android N Preview 2
Merge "Move sysfs_thermal definition to global policy."