Merge "Switching to AndroidJUnitRunner instrumentation"