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

Change-Id: I6476ff0764e976ce4b3a684c1ea0ff3d702fb09c