am 2acda931: Merge "More .classpath cleanup" into froyo