Merge change I12f05ef0 into eclair

* changes:
  Add ability to retrieve instrumentations from android_manifest parser.