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