Merge "Remove unused core-intra-stubs-system-modules and core.intra.stubs"