Merge \\"flounder: update kernel prebuilt\\" into nyc-dev am: 5789bf12cb am: a97b5ad92c Change-Id: Ic8a22ef607e6aeb532c664384a9d3f398c80c10a