Android O MR1 IOT Release Smart Display r8 (OIM6.190107.025)
Android O MR1 IOT Release Smart Display r5 (OIM4.181017.001.A7)
Merge remote-tracking branch 'aosp/upstream-hikey' into atf am: 8608ac5262 am: 2afd8f04b3
am: 090aac9db6

Change-Id: I61511d9c7825ae39e206d7410e5ca9f0f0259472