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

Change-Id: Id17254f337cf4c8097689d42c797696be25418b6