Merge "Update kernel / wifi prebuilt" into gingerbread