Merge "Fix Eclipse classpath for projects moved to tools/base or swt."