Repointing flump-runtime, recat and starling swc to M2.