am 4ee04869: Merge change I12f05ef0 into eclair

Merge commit '4ee0486913f0a9a478e829ba33de2eb8bc6e8a49' into eclair-mr2

* commit '4ee0486913f0a9a478e829ba33de2eb8bc6e8a49':
  Add ability to retrieve instrumentations from android_manifest parser.