Merge "flounder: update kernel prebuilt" into nyc-mr1-dev