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

Change-Id: Ia469ff28cfda480767bccc88b2a4428696ca4e10