Merge "Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into bugedk"