am e7a370fa: (-s ours) am 55cb9a03: (-s ours) Merge "Reconcile with AOSP - do not merge" into jb-mr1-dev-plus-aosp

* commit 'e7a370faf5c6cf9663218c98613eb1c018b63c58':
  mako: prebuilt kernel
tree: db9199af29a0d15ac74f0fc8615abfb35e7dc4c3
  1. kernel