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

Change-Id: I5566a4520e07958dcbc3ebf10aa4cafe2c61885c