am 4e0ce785: (-s ours) am a431cf85: am 5ff54e56: manta: kernel prebuilt (DO NOT MERGE)

* commit '4e0ce785fdc77ea96cdf5c7fc1ca56ae931e0ae8':
  manta: kernel prebuilt (DO NOT MERGE)