Merge "Fix handling of globals for new linker."