Revert a diff from upstream mono for building with old gmcs.
Add some new component GUIDs.