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

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