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