Merge remote-tracking branch 'aosp/upstream-hikey' into armtf

Change-Id: Ic77734daa3ba792cf235d52b49250a197de4328a