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

Change-Id: Icac25f498e6320ea4df53593a3bc68d6b515978b