Merge "Keep InstrumentationTestCase in main dex" am: 64c9ca5a1c am: 756f943b05
am: 6aa22f2fd0

Change-Id: I8535833cd216aa6ca24d19e05bfb6ba45f340836