Classpath changes for update to ADT 22