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

Merge commit '90ef224f8ff2b0cec58f49306d333b7489ec37e8'

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