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

Change-Id: I65534e8123199ba72c6e2d50116eafce110e6b81