more work on Android classpath port