am 5029d1f9: am a33954cd: Merge "Fix InstrumentationCtsTestRunner NPE" into froyo

Merge commit '5029d1f9d8fb842437e9910d4a7e80ca80da3ca0' into gingerbread

* commit '5029d1f9d8fb842437e9910d4a7e80ca80da3ca0':
  Fix InstrumentationCtsTestRunner NPE