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

Merge commit 'ed8d5320d27b68e57cbcfd12373aa9a5df3df06c'

* commit 'ed8d5320d27b68e57cbcfd12373aa9a5df3df06c':
  Fix InstrumentationCtsTestRunner NPE