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

Change-Id: Ia9402d48973b897662b70857431fa5caf2e5673f