Merge back new cpuidle material for v4.7.