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

Merge commit 'e2c622524116b49d5817fedf1d88e2bb1521a9ec' into gingerbread-plus-aosp

* commit 'e2c622524116b49d5817fedf1d88e2bb1521a9ec':
  Instrumentation links against the jar file for its app, so use that at the dependency.