Merge "Fix InstrumentationCtsTestRunner NPE" into froyo