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

Change-Id: Ib6f205c03af82499c809484c081f077912eee245