Merge "Correct Eclipse classpath" into jellybean