Merge "add test for per-cpu cpufreq nodes" am: 1208cdf96b am: 806fe3ed2e
am: 952b971877

Change-Id: Iebbb12e8ec9266e465b4c4bb20383a8a9b979b5c