Remove tools.jar dependency now that instrumentation is gone.  Fix other scopes.