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