Merge "Remove trout-kernel modules bundling" into rvc-dev