Merge "hikey960: Prepare for multikernel use" am: 946f30a27c am: 675a146f1c am: 71fd102070
am: 996188f504

Change-Id: I05635fad3e62bba219b35bb294cd0179d911086c