Updating classpaths to work with ADT 22