Merge changes I22cfd132,If6784590

* changes:
  Revert "hikey960/hikey: Transition to using to vendor-package"
  Revert "hikey960: Remove hifi dsp support."