Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into edk am: 27fa02b096 am: a8fa7d906e
am: 08244e3314

Change-Id: Icb98a90530a21e638de410c996bf01c7ffadb80d