Android O MR1 IOT Release 1.0.2 (4862549)
Merge remote-tracking branch 'aosp/upstream-hikey' into atf

Change-Id: I37e6b218f2745a4432645bbff43899d954c19e41