Merge "Delay running derive_classpath."