Cleanup CM build tools/Rebase against SaberMod build