Merge "new kernel and wifi prebuilts"