Merge "hikey960: Re-add prebuilt UEFI binaries (#108) to build" am: 5bab49828b am: 219057b5a0 am: 6dfbcdaf34 am: ac989f138a

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1461602

Change-Id: I392210099c1f6cc96e2598fe2af53a4da77f57a6