Merge remote-tracking branch 'aosp/upstream-hikey' into atf
am: 8608ac5262

Change-Id: I874c82fd658d72570256f5d00766689d741bd95c