Merge "crosshatch: update kernel-and-modules prebuilt"