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

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

Change-Id: I28850173221103a8f2fbb0e00131d6b0db2fe6a2