Classpath fixed for ADT 22.