am 3215afae: (-s ours) Update classpath for Eclipse DO NOT MERGE