Merge back earlier cpuidle material for v4.1.