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

Change-Id: Ic322807fdf36251c030232d70de29cea5d6e2cd6