Merge GoogleInstrumentationTestRunner features into android.support.test.

Change-Id: I07e47038b3e50234b5419499410a253d7ff89a99
19 files changed