Fixed issues with classpath after updating to ADT 22.