Merge "Switch makefiles back to specify the kernel version explicitly"