Classpath fixes to build using r22 tools