Merge "Use stubs libs for android.test.base/runner/mock"