Fixed issue with classpath after updating to ADT 22.