Merge "More .classpath cleanup" into froyo