Merge "Build core-simple against core.intra.stubs"