Android l-preview release 2
Merge "Label /sys/devices/system/cpu/cpufreq/ondemand and its files."