Merge "Revert "grouper: update prebuilt kernel""