Merge "Don't generate /etc/classpath in make."