Merge "Update Several Instrumentation AndroidTest files with the correct runner."