Merge "hikey960/hikey: Transition to using to vendor-package" am: b92752cc17

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

Change-Id: I5dc6c8ed62d52e1bd6fd1d09491ca73e3df94b86