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

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

Change-Id: Ia8328b54f8119cdf9994f0413c00a2ffe92ab8aa