diff --git a/ui/espresso/BasicSampleBundled/.gitignore b/ui/espresso/BasicSampleBundled/.gitignore
deleted file mode 100644
index 4a23383d6..000000000
--- a/ui/espresso/BasicSampleBundled/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-gen
-.settings
-project.properties
diff --git a/ui/espresso/BasicSampleBundled/AndroidManifest.xml b/ui/espresso/BasicSampleBundled/AndroidManifest.xml
deleted file mode 100644
index 6d45868e7..000000000
--- a/ui/espresso/BasicSampleBundled/AndroidManifest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.testing.espresso.basicsamplebundled"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="10"
-        android:targetSdkVersion="23" />
-
-    <application
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-
-        <activity
-            android:name="com.example.android.testing.espresso.basicsamplebundled.MainActivity"
-            android:label="@string/app_name"
-            android:exported="true" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name="com.example.android.testing.espresso.basicsamplebundled.ShowTextActivity"/>
-
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <instrumentation
-        android:name="androidx.test.runner.AndroidJUnitRunner"
-        android:targetPackage="com.example.android.testing.espresso.basicsamplebundled" />
-</manifest>
diff --git a/ui/espresso/BasicSampleBundled/README.md b/ui/espresso/BasicSampleBundled/README.md
deleted file mode 100644
index 4f662fe19..000000000
--- a/ui/espresso/BasicSampleBundled/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Basic sample for Espresso using static JAR files
-
-*If you are using Espresso with Eclipse, try this sample first.*
-
-This project uses Eclipse and ADT to build and run the tests.
-
-1. Download the project code, preferably using `git clone`.
-1. Check out the static JAR files required to run the Espresso tests in the libs/ folder of the project
-1. Run the ./remove_license.sh script to remove duplicated LICENSE.txt files. This step is required because some of the test dependencies contain LICENSE.txt files which result in this build error:
-"Error generating final archive: Found duplicate file for APK: LICENSE.txt".
-The problem is that the same LICENSE.TXT file is found multiple times and AAPT does not know how to resolve this conflict.
-1. Check out the relevant code:
-    * The application under test is located in `src/`
-    * Tests are in `tests/`
-1. Create the test configuration with a custom runner: `androidx.test.runner.AndroidJUnitRunner`
-    * Open *Run* menu | *Run Configurations*
-    * Click on Android JUnit Test
-    * Add a new configuration by pressing the "new launch configuration" button
-    * Select your project by clicking the "Browse" button
-    * Add a *Specific instrumentation runner*: `androidx.test.runner.AndroidJUnitRunner`
-1. Connect a device or start an emulator
-    * Turn animations off.
-    (On your device, under Settings->Developer options disable the following 3 settings: "Window animation scale", "Transition animation scale" and "Animator duration scale")
-1. Run the newly created configuration
-
-The application will be started on the device/emulator and a series of actions will be performed automatically.
diff --git a/ui/espresso/BasicSampleBundled/ic_launcher-web.png b/ui/espresso/BasicSampleBundled/ic_launcher-web.png
deleted file mode 100644
index 745d2e70b..000000000
Binary files a/ui/espresso/BasicSampleBundled/ic_launcher-web.png and /dev/null differ
diff --git a/ui/espresso/BasicSampleBundled/libs/android-support-v4.jar b/ui/espresso/BasicSampleBundled/libs/android-support-v4.jar
deleted file mode 100644
index bd450c734..000000000
Binary files a/ui/espresso/BasicSampleBundled/libs/android-support-v4.jar and /dev/null differ
diff --git a/ui/espresso/BasicSampleBundled/libs/espresso-contrib-2.2-release-no-dep.jar b/ui/espresso/BasicSampleBundled/libs/espresso-contrib-2.2-release-no-dep.jar
deleted file mode 100644
index a2089873c..000000000
Binary files a/ui/espresso/BasicSampleBundled/libs/espresso-contrib-2.2-release-no-dep.jar and /dev/null differ
diff --git a/ui/espresso/BasicSampleBundled/libs/espresso-core-2.2-release-no-dep.jar b/ui/espresso/BasicSampleBundled/libs/espresso-core-2.2-release-no-dep.jar
deleted file mode 100644
index 147d0e0d7..000000000
Binary files a/ui/espresso/BasicSampleBundled/libs/espresso-core-2.2-release-no-dep.jar and /dev/null differ
diff --git a/ui/espresso/BasicSampleBundled/libs/espresso-idling-resource-2.2-release-no-dep.jar b/ui/espresso/BasicSampleBundled/libs/espresso-idling-resource-2.2-release-no-dep.jar
deleted file mode 100644
index 70b28cc2f..000000000
Binary files a/ui/espresso/BasicSampleBundled/libs/espresso-idling-resource-2.2-release-no-dep.jar and /dev/null differ
diff --git a/ui/espresso/BasicSampleBundled/libs/espresso-intents-2.2-release-no-dep.jar b/ui/espresso/BasicSampleBundled/libs/espresso-intents-2.2-release-no-dep.jar
deleted file mode 100644
index c68c2671d..000000000
Binary files a/ui/espresso/BasicSampleBundled/libs/espresso-intents-2.2-release-no-dep.jar and /dev/null differ
diff --git a/ui/espresso/BasicSampleBundled/libs/espresso-web-2.2-release-no-dep.jar b/ui/espresso/BasicSampleBundled/libs/espresso-web-2.2-release-no-dep.jar
deleted file mode 100644
index f6f47bca2..000000000
Binary files a/ui/espresso/BasicSampleBundled/libs/espresso-web-2.2-release-no-dep.jar and /dev/null differ
diff --git a/ui/espresso/BasicSampleBundled/libs/exposed-instrumentation-api-publish-0.3-release-no-dep.jar b/ui/espresso/BasicSampleBundled/libs/exposed-instrumentation-api-publish-0.3-release-no-dep.jar
deleted file mode 100644
index e6a6cf96a..000000000
Binary files a/ui/espresso/BasicSampleBundled/libs/exposed-instrumentation-api-publish-0.3-release-no-dep.jar and /dev/null differ
diff --git a/ui/espresso/BasicSampleBundled/libs/guava-18.0.jar b/ui/espresso/BasicSampleBundled/libs/guava-18.0.jar
deleted file mode 100644
index 8f89e4901..000000000
Binary files a/ui/espresso/BasicSampleBundled/libs/guava-18.0.jar and /dev/null differ
diff --git a/ui/espresso/BasicSampleBundled/libs/hamcrest-core-1.3.jar b/ui/espresso/BasicSampleBundled/libs/hamcrest-core-1.3.jar
deleted file mode 100644
index 51f4b24ce..000000000
Binary files a/ui/espresso/BasicSampleBundled/libs/hamcrest-core-1.3.jar and /dev/null differ
diff --git a/ui/espresso/BasicSampleBundled/libs/hamcrest-integration-1.3.jar b/ui/espresso/BasicSampleBundled/libs/hamcrest-integration-1.3.jar
deleted file mode 100644
index 6e2f02e41..000000000
Binary files a/ui/espresso/BasicSampleBundled/libs/hamcrest-integration-1.3.jar and /dev/null differ
diff --git a/ui/espresso/BasicSampleBundled/libs/hamcrest-library-1.3.jar b/ui/espresso/BasicSampleBundled/libs/hamcrest-library-1.3.jar
deleted file mode 100644
index 197ecb331..000000000
Binary files a/ui/espresso/BasicSampleBundled/libs/hamcrest-library-1.3.jar and /dev/null differ
diff --git a/ui/espresso/BasicSampleBundled/libs/javawriter-2.1.1.jar b/ui/espresso/BasicSampleBundled/libs/javawriter-2.1.1.jar
deleted file mode 100644
index 62ad1d805..000000000
Binary files a/ui/espresso/BasicSampleBundled/libs/javawriter-2.1.1.jar and /dev/null differ
diff --git a/ui/espresso/BasicSampleBundled/libs/javax.annotation-api-1.2.jar b/ui/espresso/BasicSampleBundled/libs/javax.annotation-api-1.2.jar
deleted file mode 100644
index 9ab39ffa4..000000000
Binary files a/ui/espresso/BasicSampleBundled/libs/javax.annotation-api-1.2.jar and /dev/null differ
diff --git a/ui/espresso/BasicSampleBundled/libs/javax.inject-1.jar b/ui/espresso/BasicSampleBundled/libs/javax.inject-1.jar
deleted file mode 100644
index b2a9d0bf7..000000000
Binary files a/ui/espresso/BasicSampleBundled/libs/javax.inject-1.jar and /dev/null differ
diff --git a/ui/espresso/BasicSampleBundled/libs/jsr305-2.0.1.jar b/ui/espresso/BasicSampleBundled/libs/jsr305-2.0.1.jar
deleted file mode 100644
index 43807b02f..000000000
Binary files a/ui/espresso/BasicSampleBundled/libs/jsr305-2.0.1.jar and /dev/null differ
diff --git a/ui/espresso/BasicSampleBundled/libs/junit-4.12.jar b/ui/espresso/BasicSampleBundled/libs/junit-4.12.jar
deleted file mode 100644
index 3a7fc266c..000000000
Binary files a/ui/espresso/BasicSampleBundled/libs/junit-4.12.jar and /dev/null differ
diff --git a/ui/espresso/BasicSampleBundled/libs/rules-0.3-release-no-dep.jar b/ui/espresso/BasicSampleBundled/libs/rules-0.3-release-no-dep.jar
deleted file mode 100644
index 8d92090ac..000000000
Binary files a/ui/espresso/BasicSampleBundled/libs/rules-0.3-release-no-dep.jar and /dev/null differ
diff --git a/ui/espresso/BasicSampleBundled/libs/runner-0.3-release-no-dep.jar b/ui/espresso/BasicSampleBundled/libs/runner-0.3-release-no-dep.jar
deleted file mode 100644
index 1083473ec..000000000
Binary files a/ui/espresso/BasicSampleBundled/libs/runner-0.3-release-no-dep.jar and /dev/null differ
diff --git a/ui/espresso/BasicSampleBundled/libs/uiautomator-v18-2.1.1-release-no-dep.jar b/ui/espresso/BasicSampleBundled/libs/uiautomator-v18-2.1.1-release-no-dep.jar
deleted file mode 100644
index 87a7076f7..000000000
Binary files a/ui/espresso/BasicSampleBundled/libs/uiautomator-v18-2.1.1-release-no-dep.jar and /dev/null differ
diff --git a/ui/espresso/BasicSampleBundled/proguard-project.txt b/ui/espresso/BasicSampleBundled/proguard-project.txt
deleted file mode 100644
index f2fe1559a..000000000
--- a/ui/espresso/BasicSampleBundled/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/ui/espresso/BasicSampleBundled/remove_license.sh b/ui/espresso/BasicSampleBundled/remove_license.sh
deleted file mode 100755
index ed9f43003..000000000
--- a/ui/espresso/BasicSampleBundled/remove_license.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-zip -d libs/hamcrest-core-1.3.jar LICENSE.txt
-zip -d libs/hamcrest-library-1.3.jar LICENSE.txt
-zip -d libs/hamcrest-integration-1.3.jar LICENSE.txt
-
diff --git a/ui/espresso/BasicSampleBundled/res/drawable-hdpi/ic_launcher.png b/ui/espresso/BasicSampleBundled/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 5a06f0fda..000000000
Binary files a/ui/espresso/BasicSampleBundled/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/ui/espresso/BasicSampleBundled/res/drawable-mdpi/ic_launcher.png b/ui/espresso/BasicSampleBundled/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 1758c24c1..000000000
Binary files a/ui/espresso/BasicSampleBundled/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/ui/espresso/BasicSampleBundled/res/drawable-xhdpi/ic_launcher.png b/ui/espresso/BasicSampleBundled/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index fc92a5613..000000000
Binary files a/ui/espresso/BasicSampleBundled/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/ui/espresso/BasicSampleBundled/res/drawable-xxhdpi/ic_launcher.png b/ui/espresso/BasicSampleBundled/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 9837c49b8..000000000
Binary files a/ui/espresso/BasicSampleBundled/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/ui/espresso/BasicSampleBundled/res/layout/activity_main.xml b/ui/espresso/BasicSampleBundled/res/layout/activity_main.xml
deleted file mode 100644
index 8c1b00559..000000000
--- a/ui/espresso/BasicSampleBundled/res/layout/activity_main.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2015 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical"
-              android:padding="@dimen/activity_horizontal_margin"
-              tools:context=".MainActivity">
-
-
-    <TextView
-            android:id="@+id/textToBeChanged"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginBottom="@dimen/header_margin"
-            android:layout_marginTop="@dimen/header_margin"
-            android:text="@string/hello_world"
-            android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-
-    <EditText
-            android:id="@+id/editTextUserInput"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:hint="@string/type_something"/>
-
-    <Button
-            style="?android:attr/buttonStyleSmall"
-            android:id="@+id/changeTextBt"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/change_text"
-            android:layout_gravity="center_horizontal"/>
-
-
-    <Button
-            style="?android:attr/buttonStyleSmall"
-            android:id="@+id/activityChangeTextBtn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:text="@string/open_activity_and_change_text"/>
-</LinearLayout>
diff --git a/ui/espresso/BasicSampleBundled/res/layout/activity_show_text.xml b/ui/espresso/BasicSampleBundled/res/layout/activity_show_text.xml
deleted file mode 100644
index 87faee86d..000000000
--- a/ui/espresso/BasicSampleBundled/res/layout/activity_show_text.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2015 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:tools="http://schemas.android.com/tools"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"
-             tools:context=".ShowTextActivity">
-
-    <TextView
-            android:id="@+id/show_text_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/hello_world"
-            android:layout_gravity="center"/>
-
-</FrameLayout>
diff --git a/ui/espresso/BasicSampleBundled/res/values-v11/styles.xml b/ui/espresso/BasicSampleBundled/res/values-v11/styles.xml
deleted file mode 100644
index 51e666758..000000000
--- a/ui/espresso/BasicSampleBundled/res/values-v11/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<resources>
-
-    <!--
-        Base application theme for API 11+. This theme completely replaces
-        AppBaseTheme from res/values/styles.xml on API 11+ devices.
-    -->
-    <style name="AppBaseTheme" parent="AppTheme">
-        <!-- API 11 theme customizations can go here. -->
-    </style>
-
-</resources>
diff --git a/ui/espresso/BasicSampleBundled/res/values-v13/styles.xml b/ui/espresso/BasicSampleBundled/res/values-v13/styles.xml
deleted file mode 100644
index f10f5a511..000000000
--- a/ui/espresso/BasicSampleBundled/res/values-v13/styles.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2015 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<resources>
-    <style name="AppTheme" parent="android:Theme.Holo.Light.NoActionBar"/>
-</resources>
\ No newline at end of file
diff --git a/ui/espresso/BasicSampleBundled/res/values-v14/styles.xml b/ui/espresso/BasicSampleBundled/res/values-v14/styles.xml
deleted file mode 100644
index 9b9dee210..000000000
--- a/ui/espresso/BasicSampleBundled/res/values-v14/styles.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<resources>
-
-    <!--
-        Base application theme for API 14+. This theme completely replaces
-        AppBaseTheme from BOTH res/values/styles.xml and
-        res/values-v11/styles.xml on API 14+ devices.
-    -->
-    <style name="AppBaseTheme" parent="AppTheme">
-        <!-- API 14 theme customizations can go here. -->
-    </style>
-
-</resources>
diff --git a/ui/espresso/BasicSampleBundled/res/values-v21/styles.xml b/ui/espresso/BasicSampleBundled/res/values-v21/styles.xml
deleted file mode 100644
index ba64d4ad1..000000000
--- a/ui/espresso/BasicSampleBundled/res/values-v21/styles.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2015 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<resources>
-    <style name="AppTheme" parent="android:Theme.Material.Dialog.NoActionBar"/>
-</resources>
diff --git a/ui/espresso/BasicSampleBundled/res/values/dimens.xml b/ui/espresso/BasicSampleBundled/res/values/dimens.xml
deleted file mode 100644
index c248bef02..000000000
--- a/ui/espresso/BasicSampleBundled/res/values/dimens.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2015 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<resources>
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-    <dimen name="header_margin">32dp</dimen>
-</resources>
diff --git a/ui/espresso/BasicSampleBundled/res/values/strings.xml b/ui/espresso/BasicSampleBundled/res/values/strings.xml
deleted file mode 100644
index 399cd9931..000000000
--- a/ui/espresso/BasicSampleBundled/res/values/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2015 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<resources>
-    <string name="app_name">Basic Espresso sample</string>
-    <string name="hello_world">Hello Espresso!</string>
-    <string name="change_text">Change text</string>
-    <string name="type_something">type something…</string>
-    <string name="open_activity_and_change_text">Open activity and change text</string>
-</resources>
diff --git a/ui/espresso/BasicSampleBundled/res/values/styles.xml b/ui/espresso/BasicSampleBundled/res/values/styles.xml
deleted file mode 100644
index 42dd2e3b8..000000000
--- a/ui/espresso/BasicSampleBundled/res/values/styles.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2015 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<resources>
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="android:Theme.Light"/>
-</resources>
\ No newline at end of file
diff --git a/ui/espresso/BasicSampleBundled/src/com/example/android/testing/espresso/basicsamplebundled/MainActivity.java b/ui/espresso/BasicSampleBundled/src/com/example/android/testing/espresso/basicsamplebundled/MainActivity.java
deleted file mode 100644
index a1849302a..000000000
--- a/ui/espresso/BasicSampleBundled/src/com/example/android/testing/espresso/basicsamplebundled/MainActivity.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-/*
- * Copyright 2015, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.testing.espresso.basicsamplebundled;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.TextView;
-
-
-/**
- * An {@link Activity} that gets a text string from the user and displays it back when the user
- * clicks on one of the two buttons. The first one shows it in the same activity and the second
- * one opens another activity and displays the message.
- */
-public class MainActivity extends Activity implements View.OnClickListener {
-
-    // The TextView used to display the message inside the Activity.
-    private TextView mTextView;
-
-    // The EditText where the user types the message.
-    private EditText mEditText;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        // Set the listeners for the buttons.
-        findViewById(R.id.changeTextBt).setOnClickListener(this);
-        findViewById(R.id.activityChangeTextBtn).setOnClickListener(this);
-
-        mTextView = (TextView) findViewById(R.id.textToBeChanged);
-        mEditText = (EditText) findViewById(R.id.editTextUserInput);
-    }
-
-    @Override
-    public void onClick(View view) {
-        // Get the text from the EditText view.
-        final String text = mEditText.getText().toString();
-
-        switch (view.getId()) {
-            case R.id.changeTextBt:
-                // First button's interaction: set a text in a text view.
-                mTextView.setText(text);
-                break;
-            case R.id.activityChangeTextBtn:
-                // Second button's interaction: start an activity and send a message to it.
-                Intent intent = ShowTextActivity.newStartIntent(this, text);
-                startActivity(intent);
-                break;
-        }
-    }
-}
diff --git a/ui/espresso/BasicSampleBundled/src/com/example/android/testing/espresso/basicsamplebundled/ShowTextActivity.java b/ui/espresso/BasicSampleBundled/src/com/example/android/testing/espresso/basicsamplebundled/ShowTextActivity.java
deleted file mode 100644
index a0d4c0bb5..000000000
--- a/ui/espresso/BasicSampleBundled/src/com/example/android/testing/espresso/basicsamplebundled/ShowTextActivity.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2015, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.testing.espresso.basicsamplebundled;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.widget.TextView;
-
-import com.google.common.base.Strings;
-
-/**
- * A simple {@link Activity} that shows a message.
- */
-public class ShowTextActivity extends Activity {
-
-    // The name of the extra data sent through an {@link Intent}.
-    public final static String KEY_EXTRA_MESSAGE =
-            "com.example.android.testing.espresso.basicsample.MESSAGE";
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_show_text);
-
-        // Get the message from the Intent.
-        Intent intent = getIntent();
-        String message = Strings.nullToEmpty(intent.getStringExtra(KEY_EXTRA_MESSAGE));
-
-        // Show message.
-        ((TextView)findViewById(R.id.show_text_view)).setText(message);
-    }
-
-    /**
-     * Creates an {@link Intent} for {@link ShowTextActivity} with the message to be displayed.
-     * @param context the {@link Context} where the {@link Intent} will be used
-     * @param message a {@link String} with text to be displayed
-     * @return an {@link Intent} used to start {@link ShowTextActivity}
-     */
-    static protected Intent newStartIntent(Context context, String message) {
-        Intent newIntent = new Intent(context, ShowTextActivity.class);
-        newIntent.putExtra(KEY_EXTRA_MESSAGE, message);
-        return newIntent;
-    }
-}
diff --git a/ui/espresso/BasicSampleBundled/tests/com/example/android/testing/espresso/basicsamplebundled/tests/ChangeTextBehaviorTest.java b/ui/espresso/BasicSampleBundled/tests/com/example/android/testing/espresso/basicsamplebundled/tests/ChangeTextBehaviorTest.java
deleted file mode 100644
index 8ae6b5834..000000000
--- a/ui/espresso/BasicSampleBundled/tests/com/example/android/testing/espresso/basicsamplebundled/tests/ChangeTextBehaviorTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2015, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.testing.espresso.basicsamplebundled.tests;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
-import static androidx.test.espresso.action.ViewActions.typeText;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import android.app.Activity;
-import androidx.test.espresso.action.ViewActions;
-import androidx.test.espresso.matcher.ViewMatchers;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.LargeTest;
-
-import com.example.android.testing.espresso.basicsamplebundled.MainActivity;
-import com.example.android.testing.espresso.basicsamplebundled.R;
-
-
-
-
-/**
- * Basic tests showcasing simple view matchers and actions like {@link ViewMatchers#withId},
- * {@link ViewActions#click} and {@link ViewActions#typeText}.
- * <p>
- * Note that there is no need to tell Espresso that a view is in a different {@link Activity}.
- */
-@RunWith(AndroidJUnit4.class)
-@LargeTest
-public class ChangeTextBehaviorTest {
-
-    public static final String STRING_TO_BE_TYPED = "Espresso";
-
-    /**
-     * A JUnit {@link Rule @Rule} to launch your activity under test. This is a replacement
-     * for {@link android.test.ActivityInstrumentationTestCase2}.
-     * <p>
-     * Rules are interceptors which are executed for each test method and will run before
-     * any of your setup code in the {@link Before @Before} method.
-     * <p>
-     * {@link ActivityTestRule} will create and launch of the activity for you and also expose
-     * the activity under test. To get a reference to the activity you can use
-     * the {@link ActivityTestRule#getActivity()} method.
-     */
-    @Rule
-    public ActivityTestRule<MainActivity> mActivityRule = new ActivityTestRule<MainActivity>(
-            MainActivity.class);
-
-    @Test
-    public void changeText_sameActivity() {
-        // Type text and then press the button.
-        onView(withId(R.id.editTextUserInput))
-                .perform(typeText(STRING_TO_BE_TYPED), closeSoftKeyboard());
-        onView(withId(R.id.changeTextBt)).perform(click());
-
-        // Check that the text was changed.
-        onView(withId(R.id.textToBeChanged)).check(matches(withText(STRING_TO_BE_TYPED)));
-    }
-
-    @Test
-    public void changeText_newActivity() {
-        // Type text and then press the button.
-        onView(withId(R.id.editTextUserInput)).perform(typeText(STRING_TO_BE_TYPED),
-                closeSoftKeyboard());
-        onView(withId(R.id.activityChangeTextBtn)).perform(click());
-
-        // This view is in a different Activity, no need to tell Espresso.
-        onView(withId(R.id.show_text_view)).check(matches(withText(STRING_TO_BE_TYPED)));
-    }
-}
\ No newline at end of file
diff --git a/ui/espresso/BasicSampleBundled/tests/com/example/android/testing/espresso/basicsamplebundled/tests/EnableJUnit4InEclipse.java b/ui/espresso/BasicSampleBundled/tests/com/example/android/testing/espresso/basicsamplebundled/tests/EnableJUnit4InEclipse.java
deleted file mode 100644
index 68922a58b..000000000
--- a/ui/espresso/BasicSampleBundled/tests/com/example/android/testing/espresso/basicsamplebundled/tests/EnableJUnit4InEclipse.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2015, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.testing.espresso.basicsamplebundled.tests;
-
-import junit.framework.TestCase;
-
-/**
- * Unfortunately this is required by Eclipse to run JUnit4 style tests.
- *
- * <p>
- * This workaround tricks Eclipse into thinking there are actual tests to run. To find out if any
- * tests are available, Eclipse looks at classes which extend from {@link TestCase} or
- * {@link TestSuite}. As JUnit4 tests do not extend from {@link TestCase} anymore this pre-check
- * fails and Eclipse will not even attempt to start the runner.
- *
- * <p>
- * Once Eclipse detects this TestCase, the AndroidJUnitRunner will be able to detect the rest of the
- * tests.
- */
-public class EnableJUnit4InEclipse extends TestCase {
-    public void testDummy() {};
-}