Merge "hikey960: Prepare for multikernel use"