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

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

Change-Id: I9c46715f610962c4b9bc3892a3ade41b014b1950