Merge "Keep InstrumentationTestCase in main dex"