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

Change-Id: I9dfd9660eab09034915b1434f7907ad22d8cb94b