Merge "Merge GoogleInstrumentationTestRunner features into android.support.test."