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

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