Merge remote-tracking branch 'android-4.9' into 'android-4.9-eas-dev'

Fixed merge conflicts caused by 8a174b47 ("sched/fair: prevent
possible infinite loop in sched_group_energy)

Change-Id: Iba35631a213b88f6361838f28573af3407568919
Signed-off-by: Quentin Perret <quentin.perret@arm.com>