Merge "Instrumentation links against the jar file for its app, so use that at the dependency." into gingerbread