Merge "hikey960: Prepare for multikernel use" am: 946f30a27c
am: 675a146f1c

Change-Id: I65adcdbec51011e75afe62ffdd01996ada50166a