am ace7d0ae: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'ace7d0aee5d1dcbcabc8bf075e8ee21e21e747ac':
  mako: update prebuilt kernel
tree: ab8df01ff2c2e43f5652ec577d40365246bd046f
  1. kernel