am c534b325: (-s ours) merge in release branch changes (no-op).

* commit 'c534b3256120fae723df655947446c6e2d907da9':
  mako: update prebuilt kernel