Merge "Revert "Use android.test.base.stubs instead of android.test.base""