Merge "Fix NPE in InstrumentationTestRunner"