Merge "grouper: update prebuilt kernel" into jb-mr2-dev