Merge with MK4 kernel source

Change-Id: I67b494555fe4868e0aff1565c7db2f0d435738dd
Signed-off-by: Willi Ye <williye97@gmail.com>