Merge "Switch to the kernel from kernel/prebuilts"