Merge "Remove --ignore-classes-on-classpath argument"