Merge "Fix Eclipse classpath file for ICS."