Merge back earlier cpuidle material for v3.13.