Merge back earlier cpuidle changes for v4.7.