Merge "ide: eclipse: Fix classpath errors" into gingerbread