am cf45d4c8: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit 'cf45d4c837da933b53b1cef18177029d811eaade':
  mako: update prebuilt kernel - do not merge
tree: c2e3362b585f4aba65579ee46fcc3577fd9eb378
  1. kernel