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

Change-Id: I08946501c59618ef607cb6dfa8025c72739d9d50