Merge "shamu: update prebuilt kernel" into nyc-mr1-dev am: 19bf5a2012 am: 05ed5bf280 Change-Id: Ia91f64900f11564d76d426428ecc207611803617