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