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