am 0ccf9b90: (-s ours) am 6bb9dec4: Merge "grouper: update prebuilt kernel" into jb-dev

* commit '0ccf9b90957b8196b0fee68190ffa34fbbabc4be':
  grouper: update prebuilt kernel