DO NOT MERGE: Update lmp-docs prebuilts for wear

Synched with change 8d594385273af9656bf145a4f85e1d73c4ed8c69 in
klp-modular-docs.

Includes samples:
- AgendaData
- DataLayer
- DelayedConfirmation
- ElizaChat
- EmbeddedApp
- FindMyPhone
- Flashlight
- Geofencing
- GridViewPager
- JumpingJack
- Notifications
- Quiz
- RecipeAssistant
- SkeletonWearableApp
- SpeedTracker
- SynchronizedNotifications
- Timer
- WatchViewStub

Change-Id: I2b48964d8b8e1790f2978ef90581dccbe9b54d00
diff --git a/prebuilts/gradle/AgendaData/Application/build.gradle b/prebuilts/gradle/AgendaData/Application/build.gradle
index 1b09073..0c6e001 100644
--- a/prebuilts/gradle/AgendaData/Application/build.gradle
+++ b/prebuilts/gradle/AgendaData/Application/build.gradle
@@ -29,14 +29,9 @@
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 20
 
-    buildToolsVersion  "21.0.0"
-
-    defaultConfig {
-        minSdkVersion 20
-        targetSdkVersion 21
-    }
+    buildToolsVersion "20"
 
     sourceSets {
         main {
diff --git a/prebuilts/gradle/AgendaData/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/AgendaData/Application/src/main/AndroidManifest.xml
index be34231..284e0e6 100644
--- a/prebuilts/gradle/AgendaData/Application/src/main/AndroidManifest.xml
+++ b/prebuilts/gradle/AgendaData/Application/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.example.android.wearable.agendadata">
 
-    <uses-sdk android:minSdkVersion="19"
-        android:targetSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="18"
+        android:targetSdkVersion="20" />
 
     <uses-permission android:name="android.permission.READ_CALENDAR" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
diff --git a/prebuilts/gradle/AgendaData/Application/src/main/res/values-v21/template-styles.xml b/prebuilts/gradle/AgendaData/Application/src/main/res/values-v21/template-styles.xml
deleted file mode 100644
index 134fcd9..0000000
--- a/prebuilts/gradle/AgendaData/Application/src/main/res/values-v21/template-styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  Copyright 2014 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>
-
-    <!-- Activity themes -->
-    <style name="Theme.Base" parent="android:Theme.Material.Light" />
-
-</resources>
diff --git a/prebuilts/gradle/AgendaData/Shared/src/main/AndroidManifest.xml b/prebuilts/gradle/AgendaData/Shared/src/main/AndroidManifest.xml
deleted file mode 100644
index 5f1e6df..0000000
--- a/prebuilts/gradle/AgendaData/Shared/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.wearable.agendadata.common">
-
-    <application android:allowBackup="true"
-        android:label="@string/app_name">
-    </application>
-
-</manifest>
diff --git a/prebuilts/gradle/AgendaData/Shared/src/main/res/values/strings.xml b/prebuilts/gradle/AgendaData/Shared/src/main/res/values/strings.xml
deleted file mode 100644
index 0f2bb90..0000000
--- a/prebuilts/gradle/AgendaData/Shared/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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">Shared</string>
-</resources>
diff --git a/prebuilts/gradle/AgendaData/Wearable/build.gradle b/prebuilts/gradle/AgendaData/Wearable/build.gradle
index 483928f..864b2fd 100644
--- a/prebuilts/gradle/AgendaData/Wearable/build.gradle
+++ b/prebuilts/gradle/AgendaData/Wearable/build.gradle
@@ -29,7 +29,7 @@
 android {
     compileSdkVersion 'android-20'
 
-    buildToolsVersion  "21.0.0"
+    buildToolsVersion '20'
 
     buildTypes {
         release {
diff --git a/prebuilts/gradle/DataLayer/Application/build.gradle b/prebuilts/gradle/DataLayer/Application/build.gradle
index 1b09073..0c6e001 100644
--- a/prebuilts/gradle/DataLayer/Application/build.gradle
+++ b/prebuilts/gradle/DataLayer/Application/build.gradle
@@ -29,14 +29,9 @@
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 20
 
-    buildToolsVersion  "21.0.0"
-
-    defaultConfig {
-        minSdkVersion 20
-        targetSdkVersion 21
-    }
+    buildToolsVersion "20"
 
     sourceSets {
         main {
diff --git a/prebuilts/gradle/DataLayer/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/DataLayer/Application/src/main/AndroidManifest.xml
index 787e273..821bc11 100644
--- a/prebuilts/gradle/DataLayer/Application/src/main/AndroidManifest.xml
+++ b/prebuilts/gradle/DataLayer/Application/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.example.android.wearable.datalayer" >
 
-    <uses-sdk android:minSdkVersion="19"
-              android:targetSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="18"
+              android:targetSdkVersion="20" />
 
     <uses-feature android:name="android.hardware.camera" android:required="false" />
 
diff --git a/prebuilts/gradle/DataLayer/Application/src/main/res/values-v21/template-styles.xml b/prebuilts/gradle/DataLayer/Application/src/main/res/values-v21/template-styles.xml
deleted file mode 100644
index 134fcd9..0000000
--- a/prebuilts/gradle/DataLayer/Application/src/main/res/values-v21/template-styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  Copyright 2014 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>
-
-    <!-- Activity themes -->
-    <style name="Theme.Base" parent="android:Theme.Material.Light" />
-
-</resources>
diff --git a/prebuilts/gradle/DataLayer/Shared/src/main/AndroidManifest.xml b/prebuilts/gradle/DataLayer/Shared/src/main/AndroidManifest.xml
deleted file mode 100644
index d05bfd5..0000000
--- a/prebuilts/gradle/DataLayer/Shared/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.wearable.datalayer.common">
-
-    <application android:allowBackup="true"
-        android:label="@string/app_name">
-    </application>
-
-</manifest>
diff --git a/prebuilts/gradle/DataLayer/Shared/src/main/res/values/strings.xml b/prebuilts/gradle/DataLayer/Shared/src/main/res/values/strings.xml
deleted file mode 100644
index 0f2bb90..0000000
--- a/prebuilts/gradle/DataLayer/Shared/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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">Shared</string>
-</resources>
diff --git a/prebuilts/gradle/DataLayer/Wearable/build.gradle b/prebuilts/gradle/DataLayer/Wearable/build.gradle
index 483928f..864b2fd 100644
--- a/prebuilts/gradle/DataLayer/Wearable/build.gradle
+++ b/prebuilts/gradle/DataLayer/Wearable/build.gradle
@@ -29,7 +29,7 @@
 android {
     compileSdkVersion 'android-20'
 
-    buildToolsVersion  "21.0.0"
+    buildToolsVersion '20'
 
     buildTypes {
         release {
diff --git a/prebuilts/gradle/DelayedConfirmation/Application/build.gradle b/prebuilts/gradle/DelayedConfirmation/Application/build.gradle
index 1b09073..0c6e001 100644
--- a/prebuilts/gradle/DelayedConfirmation/Application/build.gradle
+++ b/prebuilts/gradle/DelayedConfirmation/Application/build.gradle
@@ -29,14 +29,9 @@
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 20
 
-    buildToolsVersion  "21.0.0"
-
-    defaultConfig {
-        minSdkVersion 20
-        targetSdkVersion 21
-    }
+    buildToolsVersion "20"
 
     sourceSets {
         main {
diff --git a/prebuilts/gradle/DelayedConfirmation/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/DelayedConfirmation/Application/src/main/AndroidManifest.xml
index 3fa1f36..20b7aab 100644
--- a/prebuilts/gradle/DelayedConfirmation/Application/src/main/AndroidManifest.xml
+++ b/prebuilts/gradle/DelayedConfirmation/Application/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.example.android.wearable.delayedconfirmation" >
 
-    <uses-sdk android:minSdkVersion="19"
-        android:targetSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="18"
+        android:targetSdkVersion="20" />
 
     <application
             android:allowBackup="true"
diff --git a/prebuilts/gradle/DelayedConfirmation/Application/src/main/res/values-v21/template-styles.xml b/prebuilts/gradle/DelayedConfirmation/Application/src/main/res/values-v21/template-styles.xml
deleted file mode 100644
index 134fcd9..0000000
--- a/prebuilts/gradle/DelayedConfirmation/Application/src/main/res/values-v21/template-styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  Copyright 2014 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>
-
-    <!-- Activity themes -->
-    <style name="Theme.Base" parent="android:Theme.Material.Light" />
-
-</resources>
diff --git a/prebuilts/gradle/DelayedConfirmation/Shared/src/main/AndroidManifest.xml b/prebuilts/gradle/DelayedConfirmation/Shared/src/main/AndroidManifest.xml
deleted file mode 100644
index 0dd8908..0000000
--- a/prebuilts/gradle/DelayedConfirmation/Shared/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.wearable.delayedconfirmation.common">
-
-    <application android:allowBackup="true"
-        android:label="@string/app_name">
-    </application>
-
-</manifest>
diff --git a/prebuilts/gradle/DelayedConfirmation/Shared/src/main/res/values/strings.xml b/prebuilts/gradle/DelayedConfirmation/Shared/src/main/res/values/strings.xml
deleted file mode 100644
index 0f2bb90..0000000
--- a/prebuilts/gradle/DelayedConfirmation/Shared/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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">Shared</string>
-</resources>
diff --git a/prebuilts/gradle/DelayedConfirmation/Wearable/build.gradle b/prebuilts/gradle/DelayedConfirmation/Wearable/build.gradle
index 483928f..864b2fd 100644
--- a/prebuilts/gradle/DelayedConfirmation/Wearable/build.gradle
+++ b/prebuilts/gradle/DelayedConfirmation/Wearable/build.gradle
@@ -29,7 +29,7 @@
 android {
     compileSdkVersion 'android-20'
 
-    buildToolsVersion  "21.0.0"
+    buildToolsVersion '20'
 
     buildTypes {
         release {
diff --git a/prebuilts/gradle/ElizaChat/Application/build.gradle b/prebuilts/gradle/ElizaChat/Application/build.gradle
index 805246f..75a4852 100644
--- a/prebuilts/gradle/ElizaChat/Application/build.gradle
+++ b/prebuilts/gradle/ElizaChat/Application/build.gradle
@@ -13,9 +13,9 @@
 
 dependencies {
 
-    compile "com.android.support:support-v4:21.+"
-    compile "com.android.support:support-v13:21.+"
-    compile "com.android.support:cardview-v7:21.+"
+    // Add the support lib that is appropriate for SDK 18
+    compile "com.android.support:support-v13:20.+"
+
 
 }
 
@@ -28,13 +28,9 @@
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.0.0"
+    compileSdkVersion 20
 
-    defaultConfig {
-        minSdkVersion 20
-        targetSdkVersion 21
-    }
+    buildToolsVersion "20"
 
     sourceSets {
         main {
@@ -47,7 +43,6 @@
         androidTest.java.srcDirs = ['tests/src']
 
     }
-
 }
 
 
diff --git a/prebuilts/gradle/ElizaChat/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/ElizaChat/Application/src/main/AndroidManifest.xml
index 14e9823..98d4d73 100644
--- a/prebuilts/gradle/ElizaChat/Application/src/main/AndroidManifest.xml
+++ b/prebuilts/gradle/ElizaChat/Application/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.android.wearable.elizachat" >
 
-    <uses-sdk android:minSdkVersion="19"
-              android:targetSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="18"
+              android:targetSdkVersion="20" />
 
     <application
         android:allowBackup="true"
diff --git a/prebuilts/gradle/ElizaChat/Application/src/main/res/values-v21/template-styles.xml b/prebuilts/gradle/ElizaChat/Application/src/main/res/values-v21/template-styles.xml
deleted file mode 100644
index 134fcd9..0000000
--- a/prebuilts/gradle/ElizaChat/Application/src/main/res/values-v21/template-styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  Copyright 2014 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>
-
-    <!-- Activity themes -->
-    <style name="Theme.Base" parent="android:Theme.Material.Light" />
-
-</resources>
diff --git a/prebuilts/gradle/ElizaChat/Shared/src/main/AndroidManifest.xml b/prebuilts/gradle/ElizaChat/Shared/src/main/AndroidManifest.xml
deleted file mode 100644
index dfbb092..0000000
--- a/prebuilts/gradle/ElizaChat/Shared/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.wearable.elizachat.common">
-
-    <application android:allowBackup="true"
-        android:label="@string/app_name">
-    </application>
-
-</manifest>
diff --git a/prebuilts/gradle/ElizaChat/Shared/src/main/res/values/strings.xml b/prebuilts/gradle/ElizaChat/Shared/src/main/res/values/strings.xml
deleted file mode 100644
index 0f2bb90..0000000
--- a/prebuilts/gradle/ElizaChat/Shared/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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">Shared</string>
-</resources>
diff --git a/prebuilts/gradle/EmbeddedApp/Application/build.gradle b/prebuilts/gradle/EmbeddedApp/Application/build.gradle
index 1b09073..0c6e001 100644
--- a/prebuilts/gradle/EmbeddedApp/Application/build.gradle
+++ b/prebuilts/gradle/EmbeddedApp/Application/build.gradle
@@ -29,14 +29,9 @@
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 20
 
-    buildToolsVersion  "21.0.0"
-
-    defaultConfig {
-        minSdkVersion 20
-        targetSdkVersion 21
-    }
+    buildToolsVersion "20"
 
     sourceSets {
         main {
diff --git a/prebuilts/gradle/EmbeddedApp/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/EmbeddedApp/Application/src/main/AndroidManifest.xml
index ee47ffe..eb2e01c 100644
--- a/prebuilts/gradle/EmbeddedApp/Application/src/main/AndroidManifest.xml
+++ b/prebuilts/gradle/EmbeddedApp/Application/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.android.wearable.embeddedapp" >
-    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
+    <uses-sdk android:minSdkVersion="18" android:targetSdkVersion="20" />
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
diff --git a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/values-v21/template-styles.xml b/prebuilts/gradle/EmbeddedApp/Application/src/main/res/values-v21/template-styles.xml
deleted file mode 100644
index 134fcd9..0000000
--- a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/values-v21/template-styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  Copyright 2014 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>
-
-    <!-- Activity themes -->
-    <style name="Theme.Base" parent="android:Theme.Material.Light" />
-
-</resources>
diff --git a/prebuilts/gradle/EmbeddedApp/Shared/src/main/AndroidManifest.xml b/prebuilts/gradle/EmbeddedApp/Shared/src/main/AndroidManifest.xml
deleted file mode 100644
index 4801715..0000000
--- a/prebuilts/gradle/EmbeddedApp/Shared/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.wearable.embeddedapp.common">
-
-    <application android:allowBackup="true"
-        android:label="@string/app_name">
-    </application>
-
-</manifest>
diff --git a/prebuilts/gradle/EmbeddedApp/Shared/src/main/res/values/strings.xml b/prebuilts/gradle/EmbeddedApp/Shared/src/main/res/values/strings.xml
deleted file mode 100644
index 0f2bb90..0000000
--- a/prebuilts/gradle/EmbeddedApp/Shared/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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">Shared</string>
-</resources>
diff --git a/prebuilts/gradle/EmbeddedApp/Wearable/build.gradle b/prebuilts/gradle/EmbeddedApp/Wearable/build.gradle
index 483928f..864b2fd 100644
--- a/prebuilts/gradle/EmbeddedApp/Wearable/build.gradle
+++ b/prebuilts/gradle/EmbeddedApp/Wearable/build.gradle
@@ -29,7 +29,7 @@
 android {
     compileSdkVersion 'android-20'
 
-    buildToolsVersion  "21.0.0"
+    buildToolsVersion '20'
 
     buildTypes {
         release {
diff --git a/prebuilts/gradle/FindMyPhone/Application/build.gradle b/prebuilts/gradle/FindMyPhone/Application/build.gradle
index 1b09073..0c6e001 100644
--- a/prebuilts/gradle/FindMyPhone/Application/build.gradle
+++ b/prebuilts/gradle/FindMyPhone/Application/build.gradle
@@ -29,14 +29,9 @@
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 20
 
-    buildToolsVersion  "21.0.0"
-
-    defaultConfig {
-        minSdkVersion 20
-        targetSdkVersion 21
-    }
+    buildToolsVersion "20"
 
     sourceSets {
         main {
diff --git a/prebuilts/gradle/FindMyPhone/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/FindMyPhone/Application/src/main/AndroidManifest.xml
index e88a046..0427025 100644
--- a/prebuilts/gradle/FindMyPhone/Application/src/main/AndroidManifest.xml
+++ b/prebuilts/gradle/FindMyPhone/Application/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.example.android.wearable.findphone">
 
-    <uses-sdk android:minSdkVersion="19"
-              android:targetSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="18"
+              android:targetSdkVersion="20" />
 
     <uses-permission android:name="android.permission.VIBRATE" />
     <application
diff --git a/prebuilts/gradle/FindMyPhone/Application/src/main/res/values-v21/template-styles.xml b/prebuilts/gradle/FindMyPhone/Application/src/main/res/values-v21/template-styles.xml
deleted file mode 100644
index 134fcd9..0000000
--- a/prebuilts/gradle/FindMyPhone/Application/src/main/res/values-v21/template-styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  Copyright 2014 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>
-
-    <!-- Activity themes -->
-    <style name="Theme.Base" parent="android:Theme.Material.Light" />
-
-</resources>
diff --git a/prebuilts/gradle/FindMyPhone/Shared/src/main/AndroidManifest.xml b/prebuilts/gradle/FindMyPhone/Shared/src/main/AndroidManifest.xml
deleted file mode 100644
index b51d6f7..0000000
--- a/prebuilts/gradle/FindMyPhone/Shared/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.wearable.findphone.common">
-
-    <application android:allowBackup="true"
-        android:label="@string/app_name">
-    </application>
-
-</manifest>
diff --git a/prebuilts/gradle/FindMyPhone/Shared/src/main/res/values/strings.xml b/prebuilts/gradle/FindMyPhone/Shared/src/main/res/values/strings.xml
deleted file mode 100644
index 0f2bb90..0000000
--- a/prebuilts/gradle/FindMyPhone/Shared/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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">Shared</string>
-</resources>
diff --git a/prebuilts/gradle/FindMyPhone/Wearable/build.gradle b/prebuilts/gradle/FindMyPhone/Wearable/build.gradle
index 483928f..864b2fd 100644
--- a/prebuilts/gradle/FindMyPhone/Wearable/build.gradle
+++ b/prebuilts/gradle/FindMyPhone/Wearable/build.gradle
@@ -29,7 +29,7 @@
 android {
     compileSdkVersion 'android-20'
 
-    buildToolsVersion  "21.0.0"
+    buildToolsVersion '20'
 
     buildTypes {
         release {
diff --git a/prebuilts/gradle/Flashlight/Application/build.gradle b/prebuilts/gradle/Flashlight/Application/build.gradle
index 1b09073..0c6e001 100644
--- a/prebuilts/gradle/Flashlight/Application/build.gradle
+++ b/prebuilts/gradle/Flashlight/Application/build.gradle
@@ -29,14 +29,9 @@
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 20
 
-    buildToolsVersion  "21.0.0"
-
-    defaultConfig {
-        minSdkVersion 20
-        targetSdkVersion 21
-    }
+    buildToolsVersion "20"
 
     sourceSets {
         main {
diff --git a/prebuilts/gradle/Flashlight/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/Flashlight/Application/src/main/AndroidManifest.xml
index 44cfdd3..73d1d52 100644
--- a/prebuilts/gradle/Flashlight/Application/src/main/AndroidManifest.xml
+++ b/prebuilts/gradle/Flashlight/Application/src/main/AndroidManifest.xml
@@ -18,8 +18,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.android.wearable.flashlight">
 
-    <uses-sdk android:minSdkVersion="19"
-              android:targetSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="18"
+              android:targetSdkVersion="20" />
 
     <application android:allowBackup="true"
         android:label="@string/app_name">
diff --git a/prebuilts/gradle/Flashlight/Application/src/main/res/values-v21/template-styles.xml b/prebuilts/gradle/Flashlight/Application/src/main/res/values-v21/template-styles.xml
deleted file mode 100644
index 134fcd9..0000000
--- a/prebuilts/gradle/Flashlight/Application/src/main/res/values-v21/template-styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  Copyright 2014 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>
-
-    <!-- Activity themes -->
-    <style name="Theme.Base" parent="android:Theme.Material.Light" />
-
-</resources>
diff --git a/prebuilts/gradle/Flashlight/Shared/src/main/AndroidManifest.xml b/prebuilts/gradle/Flashlight/Shared/src/main/AndroidManifest.xml
deleted file mode 100644
index b3cd767..0000000
--- a/prebuilts/gradle/Flashlight/Shared/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.wearable.flashlight.common">
-
-    <application android:allowBackup="true"
-        android:label="@string/app_name">
-    </application>
-
-</manifest>
diff --git a/prebuilts/gradle/Flashlight/Shared/src/main/res/values/strings.xml b/prebuilts/gradle/Flashlight/Shared/src/main/res/values/strings.xml
deleted file mode 100644
index 0f2bb90..0000000
--- a/prebuilts/gradle/Flashlight/Shared/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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">Shared</string>
-</resources>
diff --git a/prebuilts/gradle/Flashlight/Wearable/build.gradle b/prebuilts/gradle/Flashlight/Wearable/build.gradle
index 483928f..864b2fd 100644
--- a/prebuilts/gradle/Flashlight/Wearable/build.gradle
+++ b/prebuilts/gradle/Flashlight/Wearable/build.gradle
@@ -29,7 +29,7 @@
 android {
     compileSdkVersion 'android-20'
 
-    buildToolsVersion  "21.0.0"
+    buildToolsVersion '20'
 
     buildTypes {
         release {
diff --git a/prebuilts/gradle/Geofencing/Application/build.gradle b/prebuilts/gradle/Geofencing/Application/build.gradle
index 1b09073..0c6e001 100644
--- a/prebuilts/gradle/Geofencing/Application/build.gradle
+++ b/prebuilts/gradle/Geofencing/Application/build.gradle
@@ -29,14 +29,9 @@
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 20
 
-    buildToolsVersion  "21.0.0"
-
-    defaultConfig {
-        minSdkVersion 20
-        targetSdkVersion 21
-    }
+    buildToolsVersion "20"
 
     sourceSets {
         main {
diff --git a/prebuilts/gradle/Geofencing/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/Geofencing/Application/src/main/AndroidManifest.xml
index ba97815..b5b57f6 100644
--- a/prebuilts/gradle/Geofencing/Application/src/main/AndroidManifest.xml
+++ b/prebuilts/gradle/Geofencing/Application/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.example.android.wearable.geofencing">
 
-    <uses-sdk android:minSdkVersion="19"
-              android:targetSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="18"
+              android:targetSdkVersion="20" />
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 
diff --git a/prebuilts/gradle/Geofencing/Application/src/main/res/values-v21/template-styles.xml b/prebuilts/gradle/Geofencing/Application/src/main/res/values-v21/template-styles.xml
deleted file mode 100644
index 134fcd9..0000000
--- a/prebuilts/gradle/Geofencing/Application/src/main/res/values-v21/template-styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  Copyright 2014 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>
-
-    <!-- Activity themes -->
-    <style name="Theme.Base" parent="android:Theme.Material.Light" />
-
-</resources>
diff --git a/prebuilts/gradle/Geofencing/Shared/src/main/AndroidManifest.xml b/prebuilts/gradle/Geofencing/Shared/src/main/AndroidManifest.xml
deleted file mode 100644
index 401afcb..0000000
--- a/prebuilts/gradle/Geofencing/Shared/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.wearable.geofencing.common">
-
-    <application android:allowBackup="true"
-        android:label="@string/app_name">
-    </application>
-
-</manifest>
diff --git a/prebuilts/gradle/Geofencing/Shared/src/main/res/values/strings.xml b/prebuilts/gradle/Geofencing/Shared/src/main/res/values/strings.xml
deleted file mode 100644
index 0f2bb90..0000000
--- a/prebuilts/gradle/Geofencing/Shared/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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">Shared</string>
-</resources>
diff --git a/prebuilts/gradle/Geofencing/Wearable/build.gradle b/prebuilts/gradle/Geofencing/Wearable/build.gradle
index 483928f..864b2fd 100644
--- a/prebuilts/gradle/Geofencing/Wearable/build.gradle
+++ b/prebuilts/gradle/Geofencing/Wearable/build.gradle
@@ -29,7 +29,7 @@
 android {
     compileSdkVersion 'android-20'
 
-    buildToolsVersion  "21.0.0"
+    buildToolsVersion '20'
 
     buildTypes {
         release {
diff --git a/prebuilts/gradle/GridViewPager/Application/build.gradle b/prebuilts/gradle/GridViewPager/Application/build.gradle
index 1b09073..0c6e001 100644
--- a/prebuilts/gradle/GridViewPager/Application/build.gradle
+++ b/prebuilts/gradle/GridViewPager/Application/build.gradle
@@ -29,14 +29,9 @@
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 20
 
-    buildToolsVersion  "21.0.0"
-
-    defaultConfig {
-        minSdkVersion 20
-        targetSdkVersion 21
-    }
+    buildToolsVersion "20"
 
     sourceSets {
         main {
diff --git a/prebuilts/gradle/GridViewPager/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/GridViewPager/Application/src/main/AndroidManifest.xml
index 57241ce..add48f1 100644
--- a/prebuilts/gradle/GridViewPager/Application/src/main/AndroidManifest.xml
+++ b/prebuilts/gradle/GridViewPager/Application/src/main/AndroidManifest.xml
@@ -18,8 +18,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.android.wearable.gridviewpager">
 
-    <uses-sdk android:minSdkVersion="19"
-              android:targetSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="18"
+              android:targetSdkVersion="20" />
 
     <application android:allowBackup="true"
         android:label="@string/app_name">
diff --git a/prebuilts/gradle/GridViewPager/Application/src/main/res/values-v21/template-styles.xml b/prebuilts/gradle/GridViewPager/Application/src/main/res/values-v21/template-styles.xml
deleted file mode 100644
index 134fcd9..0000000
--- a/prebuilts/gradle/GridViewPager/Application/src/main/res/values-v21/template-styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  Copyright 2014 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>
-
-    <!-- Activity themes -->
-    <style name="Theme.Base" parent="android:Theme.Material.Light" />
-
-</resources>
diff --git a/prebuilts/gradle/GridViewPager/Shared/src/main/AndroidManifest.xml b/prebuilts/gradle/GridViewPager/Shared/src/main/AndroidManifest.xml
deleted file mode 100644
index f41bc23..0000000
--- a/prebuilts/gradle/GridViewPager/Shared/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.wearable.gridviewpager.common">
-
-    <application android:allowBackup="true"
-        android:label="@string/app_name">
-    </application>
-
-</manifest>
diff --git a/prebuilts/gradle/GridViewPager/Shared/src/main/res/values/strings.xml b/prebuilts/gradle/GridViewPager/Shared/src/main/res/values/strings.xml
deleted file mode 100644
index 0f2bb90..0000000
--- a/prebuilts/gradle/GridViewPager/Shared/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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">Shared</string>
-</resources>
diff --git a/prebuilts/gradle/GridViewPager/Wearable/build.gradle b/prebuilts/gradle/GridViewPager/Wearable/build.gradle
index 483928f..864b2fd 100644
--- a/prebuilts/gradle/GridViewPager/Wearable/build.gradle
+++ b/prebuilts/gradle/GridViewPager/Wearable/build.gradle
@@ -29,7 +29,7 @@
 android {
     compileSdkVersion 'android-20'
 
-    buildToolsVersion  "21.0.0"
+    buildToolsVersion '20'
 
     buildTypes {
         release {
diff --git a/prebuilts/gradle/JumpingJack/Application/build.gradle b/prebuilts/gradle/JumpingJack/Application/build.gradle
index 1b09073..0c6e001 100644
--- a/prebuilts/gradle/JumpingJack/Application/build.gradle
+++ b/prebuilts/gradle/JumpingJack/Application/build.gradle
@@ -29,14 +29,9 @@
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 20
 
-    buildToolsVersion  "21.0.0"
-
-    defaultConfig {
-        minSdkVersion 20
-        targetSdkVersion 21
-    }
+    buildToolsVersion "20"
 
     sourceSets {
         main {
diff --git a/prebuilts/gradle/JumpingJack/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/JumpingJack/Application/src/main/AndroidManifest.xml
index e778437..7610f59 100644
--- a/prebuilts/gradle/JumpingJack/Application/src/main/AndroidManifest.xml
+++ b/prebuilts/gradle/JumpingJack/Application/src/main/AndroidManifest.xml
@@ -18,8 +18,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.android.wearable.jumpingjack">
 
-    <uses-sdk android:minSdkVersion="19"
-              android:targetSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="18"
+              android:targetSdkVersion="20" />
+    <uses-permission android:name="android.permission.VIBRATE"/>
 
     <application android:allowBackup="true"
         android:label="@string/app_name">
diff --git a/prebuilts/gradle/JumpingJack/Application/src/main/res/values-v21/template-styles.xml b/prebuilts/gradle/JumpingJack/Application/src/main/res/values-v21/template-styles.xml
deleted file mode 100644
index 134fcd9..0000000
--- a/prebuilts/gradle/JumpingJack/Application/src/main/res/values-v21/template-styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  Copyright 2014 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>
-
-    <!-- Activity themes -->
-    <style name="Theme.Base" parent="android:Theme.Material.Light" />
-
-</resources>
diff --git a/prebuilts/gradle/JumpingJack/Shared/src/main/AndroidManifest.xml b/prebuilts/gradle/JumpingJack/Shared/src/main/AndroidManifest.xml
deleted file mode 100644
index d2fa0aa..0000000
--- a/prebuilts/gradle/JumpingJack/Shared/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.wearable.jumpingjack.common">
-
-    <application android:allowBackup="true"
-        android:label="@string/app_name">
-    </application>
-
-</manifest>
diff --git a/prebuilts/gradle/JumpingJack/Shared/src/main/res/values/strings.xml b/prebuilts/gradle/JumpingJack/Shared/src/main/res/values/strings.xml
deleted file mode 100644
index 0f2bb90..0000000
--- a/prebuilts/gradle/JumpingJack/Shared/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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">Shared</string>
-</resources>
diff --git a/prebuilts/gradle/JumpingJack/Wearable/build.gradle b/prebuilts/gradle/JumpingJack/Wearable/build.gradle
index 483928f..864b2fd 100644
--- a/prebuilts/gradle/JumpingJack/Wearable/build.gradle
+++ b/prebuilts/gradle/JumpingJack/Wearable/build.gradle
@@ -29,7 +29,7 @@
 android {
     compileSdkVersion 'android-20'
 
-    buildToolsVersion  "21.0.0"
+    buildToolsVersion '20'
 
     buildTypes {
         release {
diff --git a/prebuilts/gradle/Notifications/Application/build.gradle b/prebuilts/gradle/Notifications/Application/build.gradle
index 1b09073..0c6e001 100644
--- a/prebuilts/gradle/Notifications/Application/build.gradle
+++ b/prebuilts/gradle/Notifications/Application/build.gradle
@@ -29,14 +29,9 @@
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 20
 
-    buildToolsVersion  "21.0.0"
-
-    defaultConfig {
-        minSdkVersion 20
-        targetSdkVersion 21
-    }
+    buildToolsVersion "20"
 
     sourceSets {
         main {
diff --git a/prebuilts/gradle/Notifications/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/Notifications/Application/src/main/AndroidManifest.xml
index a0ed729..c7b2da7 100644
--- a/prebuilts/gradle/Notifications/Application/src/main/AndroidManifest.xml
+++ b/prebuilts/gradle/Notifications/Application/src/main/AndroidManifest.xml
@@ -18,8 +18,8 @@
         package="com.example.android.support.wearable.notifications" >
 
 
-    <uses-sdk android:minSdkVersion="19"
-              android:targetSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="18"
+              android:targetSdkVersion="20" />
 
     <application
             android:allowBackup="true"
diff --git a/prebuilts/gradle/Notifications/Application/src/main/res/values-v21/template-styles.xml b/prebuilts/gradle/Notifications/Application/src/main/res/values-v21/template-styles.xml
deleted file mode 100644
index 134fcd9..0000000
--- a/prebuilts/gradle/Notifications/Application/src/main/res/values-v21/template-styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  Copyright 2014 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>
-
-    <!-- Activity themes -->
-    <style name="Theme.Base" parent="android:Theme.Material.Light" />
-
-</resources>
diff --git a/prebuilts/gradle/Notifications/Shared/src/main/AndroidManifest.xml b/prebuilts/gradle/Notifications/Shared/src/main/AndroidManifest.xml
deleted file mode 100644
index cfc7e7b..0000000
--- a/prebuilts/gradle/Notifications/Shared/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.support.wearable.notifications.common">
-
-    <application android:allowBackup="true"
-        android:label="@string/app_name">
-    </application>
-
-</manifest>
diff --git a/prebuilts/gradle/Notifications/Shared/src/main/res/values/strings.xml b/prebuilts/gradle/Notifications/Shared/src/main/res/values/strings.xml
deleted file mode 100644
index 0f2bb90..0000000
--- a/prebuilts/gradle/Notifications/Shared/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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">Shared</string>
-</resources>
diff --git a/prebuilts/gradle/Notifications/Wearable/build.gradle b/prebuilts/gradle/Notifications/Wearable/build.gradle
index 483928f..864b2fd 100644
--- a/prebuilts/gradle/Notifications/Wearable/build.gradle
+++ b/prebuilts/gradle/Notifications/Wearable/build.gradle
@@ -29,7 +29,7 @@
 android {
     compileSdkVersion 'android-20'
 
-    buildToolsVersion  "21.0.0"
+    buildToolsVersion '20'
 
     buildTypes {
         release {
diff --git a/prebuilts/gradle/Quiz/Application/build.gradle b/prebuilts/gradle/Quiz/Application/build.gradle
index 1b09073..0c6e001 100644
--- a/prebuilts/gradle/Quiz/Application/build.gradle
+++ b/prebuilts/gradle/Quiz/Application/build.gradle
@@ -29,14 +29,9 @@
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 20
 
-    buildToolsVersion  "21.0.0"
-
-    defaultConfig {
-        minSdkVersion 20
-        targetSdkVersion 21
-    }
+    buildToolsVersion "20"
 
     sourceSets {
         main {
diff --git a/prebuilts/gradle/Quiz/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/Quiz/Application/src/main/AndroidManifest.xml
index ce72135..0d14a71 100644
--- a/prebuilts/gradle/Quiz/Application/src/main/AndroidManifest.xml
+++ b/prebuilts/gradle/Quiz/Application/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.example.android.wearable.quiz" >
 
-    <uses-sdk android:minSdkVersion="19"
-              android:targetSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="18"
+              android:targetSdkVersion="20" />
 
     <application
             android:allowBackup="true"
diff --git a/prebuilts/gradle/Quiz/Application/src/main/res/values-v21/template-styles.xml b/prebuilts/gradle/Quiz/Application/src/main/res/values-v21/template-styles.xml
deleted file mode 100644
index 134fcd9..0000000
--- a/prebuilts/gradle/Quiz/Application/src/main/res/values-v21/template-styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  Copyright 2014 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>
-
-    <!-- Activity themes -->
-    <style name="Theme.Base" parent="android:Theme.Material.Light" />
-
-</resources>
diff --git a/prebuilts/gradle/Quiz/Shared/src/main/AndroidManifest.xml b/prebuilts/gradle/Quiz/Shared/src/main/AndroidManifest.xml
deleted file mode 100644
index 0427456..0000000
--- a/prebuilts/gradle/Quiz/Shared/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.wearable.quiz.common">
-
-    <application android:allowBackup="true"
-        android:label="@string/app_name">
-    </application>
-
-</manifest>
diff --git a/prebuilts/gradle/Quiz/Shared/src/main/res/values/strings.xml b/prebuilts/gradle/Quiz/Shared/src/main/res/values/strings.xml
deleted file mode 100644
index 0f2bb90..0000000
--- a/prebuilts/gradle/Quiz/Shared/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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">Shared</string>
-</resources>
diff --git a/prebuilts/gradle/Quiz/Wearable/build.gradle b/prebuilts/gradle/Quiz/Wearable/build.gradle
index 483928f..864b2fd 100644
--- a/prebuilts/gradle/Quiz/Wearable/build.gradle
+++ b/prebuilts/gradle/Quiz/Wearable/build.gradle
@@ -29,7 +29,7 @@
 android {
     compileSdkVersion 'android-20'
 
-    buildToolsVersion  "21.0.0"
+    buildToolsVersion '20'
 
     buildTypes {
         release {
diff --git a/prebuilts/gradle/RecipeAssistant/Application/build.gradle b/prebuilts/gradle/RecipeAssistant/Application/build.gradle
index 805246f..75a4852 100644
--- a/prebuilts/gradle/RecipeAssistant/Application/build.gradle
+++ b/prebuilts/gradle/RecipeAssistant/Application/build.gradle
@@ -13,9 +13,9 @@
 
 dependencies {
 
-    compile "com.android.support:support-v4:21.+"
-    compile "com.android.support:support-v13:21.+"
-    compile "com.android.support:cardview-v7:21.+"
+    // Add the support lib that is appropriate for SDK 18
+    compile "com.android.support:support-v13:20.+"
+
 
 }
 
@@ -28,13 +28,9 @@
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.0.0"
+    compileSdkVersion 20
 
-    defaultConfig {
-        minSdkVersion 20
-        targetSdkVersion 21
-    }
+    buildToolsVersion "20"
 
     sourceSets {
         main {
@@ -47,7 +43,6 @@
         androidTest.java.srcDirs = ['tests/src']
 
     }
-
 }
 
 
diff --git a/prebuilts/gradle/RecipeAssistant/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/RecipeAssistant/Application/src/main/AndroidManifest.xml
index 3ddff20..a9199ed 100644
--- a/prebuilts/gradle/RecipeAssistant/Application/src/main/AndroidManifest.xml
+++ b/prebuilts/gradle/RecipeAssistant/Application/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.android.wearable.recipeassistant" >
 
-    <uses-sdk android:minSdkVersion="19"
-              android:targetSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="18"
+              android:targetSdkVersion="20" />
 
     <application
         android:allowBackup="true"
diff --git a/prebuilts/gradle/RecipeAssistant/Application/src/main/res/values-v21/template-styles.xml b/prebuilts/gradle/RecipeAssistant/Application/src/main/res/values-v21/template-styles.xml
deleted file mode 100644
index 134fcd9..0000000
--- a/prebuilts/gradle/RecipeAssistant/Application/src/main/res/values-v21/template-styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  Copyright 2014 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>
-
-    <!-- Activity themes -->
-    <style name="Theme.Base" parent="android:Theme.Material.Light" />
-
-</resources>
diff --git a/prebuilts/gradle/RecipeAssistant/Shared/src/main/AndroidManifest.xml b/prebuilts/gradle/RecipeAssistant/Shared/src/main/AndroidManifest.xml
deleted file mode 100644
index 00c8693..0000000
--- a/prebuilts/gradle/RecipeAssistant/Shared/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.wearable.recipeassistant.common">
-
-    <application android:allowBackup="true"
-        android:label="@string/app_name">
-    </application>
-
-</manifest>
diff --git a/prebuilts/gradle/RecipeAssistant/Shared/src/main/res/values/strings.xml b/prebuilts/gradle/RecipeAssistant/Shared/src/main/res/values/strings.xml
deleted file mode 100644
index 0f2bb90..0000000
--- a/prebuilts/gradle/RecipeAssistant/Shared/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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">Shared</string>
-</resources>
diff --git a/prebuilts/gradle/SkeletonWearableApp/Application/build.gradle b/prebuilts/gradle/SkeletonWearableApp/Application/build.gradle
index 1b09073..0c6e001 100644
--- a/prebuilts/gradle/SkeletonWearableApp/Application/build.gradle
+++ b/prebuilts/gradle/SkeletonWearableApp/Application/build.gradle
@@ -29,14 +29,9 @@
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 20
 
-    buildToolsVersion  "21.0.0"
-
-    defaultConfig {
-        minSdkVersion 20
-        targetSdkVersion 21
-    }
+    buildToolsVersion "20"
 
     sourceSets {
         main {
diff --git a/prebuilts/gradle/SkeletonWearableApp/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/SkeletonWearableApp/Application/src/main/AndroidManifest.xml
index 0cbc037..757c92e 100644
--- a/prebuilts/gradle/SkeletonWearableApp/Application/src/main/AndroidManifest.xml
+++ b/prebuilts/gradle/SkeletonWearableApp/Application/src/main/AndroidManifest.xml
@@ -18,8 +18,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.android.google.wearable.app">
 
-    <uses-sdk android:minSdkVersion="19"
-              android:targetSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="18"
+              android:targetSdkVersion="20" />
 
     <application android:allowBackup="true"
         android:label="@string/app_name">
diff --git a/prebuilts/gradle/SkeletonWearableApp/Application/src/main/res/values-v21/template-styles.xml b/prebuilts/gradle/SkeletonWearableApp/Application/src/main/res/values-v21/template-styles.xml
deleted file mode 100644
index 134fcd9..0000000
--- a/prebuilts/gradle/SkeletonWearableApp/Application/src/main/res/values-v21/template-styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  Copyright 2014 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>
-
-    <!-- Activity themes -->
-    <style name="Theme.Base" parent="android:Theme.Material.Light" />
-
-</resources>
diff --git a/prebuilts/gradle/SkeletonWearableApp/Shared/src/main/AndroidManifest.xml b/prebuilts/gradle/SkeletonWearableApp/Shared/src/main/AndroidManifest.xml
deleted file mode 100644
index 34de8d3..0000000
--- a/prebuilts/gradle/SkeletonWearableApp/Shared/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.google.wearable.app.common">
-
-    <application android:allowBackup="true"
-        android:label="@string/app_name">
-    </application>
-
-</manifest>
diff --git a/prebuilts/gradle/SkeletonWearableApp/Shared/src/main/res/values/strings.xml b/prebuilts/gradle/SkeletonWearableApp/Shared/src/main/res/values/strings.xml
deleted file mode 100644
index 0f2bb90..0000000
--- a/prebuilts/gradle/SkeletonWearableApp/Shared/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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">Shared</string>
-</resources>
diff --git a/prebuilts/gradle/SkeletonWearableApp/Wearable/build.gradle b/prebuilts/gradle/SkeletonWearableApp/Wearable/build.gradle
index 483928f..864b2fd 100644
--- a/prebuilts/gradle/SkeletonWearableApp/Wearable/build.gradle
+++ b/prebuilts/gradle/SkeletonWearableApp/Wearable/build.gradle
@@ -29,7 +29,7 @@
 android {
     compileSdkVersion 'android-20'
 
-    buildToolsVersion  "21.0.0"
+    buildToolsVersion '20'
 
     buildTypes {
         release {
diff --git a/prebuilts/gradle/SpeedTracker/Application/build.gradle b/prebuilts/gradle/SpeedTracker/Application/build.gradle
index 098d7fe..41fc623 100644
--- a/prebuilts/gradle/SpeedTracker/Application/build.gradle
+++ b/prebuilts/gradle/SpeedTracker/Application/build.gradle
@@ -30,14 +30,9 @@
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 20
 
-    buildToolsVersion  "21.0.0"
-
-    defaultConfig {
-        minSdkVersion 20
-        targetSdkVersion 21
-    }
+    buildToolsVersion "20"
 
     sourceSets {
         main {
diff --git a/prebuilts/gradle/SpeedTracker/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/SpeedTracker/Application/src/main/AndroidManifest.xml
index 3361a44..2a64592 100644
--- a/prebuilts/gradle/SpeedTracker/Application/src/main/AndroidManifest.xml
+++ b/prebuilts/gradle/SpeedTracker/Application/src/main/AndroidManifest.xml
@@ -7,12 +7,13 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-
+    
+    <uses-feature android:name="android.hardware.location.gps" android:required="true" />
     <uses-feature
         android:glEsVersion="0x00020000" android:required="true"/>
     <uses-sdk
         android:minSdkVersion="18"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="20" />
 
     <application
         android:name=".PhoneApplication"
diff --git a/prebuilts/gradle/SpeedTracker/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/SpeedTracker/Application/src/main/res/drawable-hdpi/ic_launcher.png
index 2275b45..2476b11 100644
--- a/prebuilts/gradle/SpeedTracker/Application/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/prebuilts/gradle/SpeedTracker/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SpeedTracker/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/SpeedTracker/Application/src/main/res/drawable-mdpi/ic_launcher.png
index 25015af..a102b79 100644
--- a/prebuilts/gradle/SpeedTracker/Application/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/prebuilts/gradle/SpeedTracker/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SpeedTracker/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/SpeedTracker/Application/src/main/res/drawable-xhdpi/ic_launcher.png
index 8aee870..8ad19e8 100644
--- a/prebuilts/gradle/SpeedTracker/Application/src/main/res/drawable-xhdpi/ic_launcher.png
+++ b/prebuilts/gradle/SpeedTracker/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SpeedTracker/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/SpeedTracker/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
index 7008a2f..9c5429f 100644
--- a/prebuilts/gradle/SpeedTracker/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ b/prebuilts/gradle/SpeedTracker/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SpeedTracker/Application/src/main/res/drawable-xxxhdpi/ic_launcher.png b/prebuilts/gradle/SpeedTracker/Application/src/main/res/drawable-xxxhdpi/ic_launcher.png
index c31ab73..b2a49f8 100644
--- a/prebuilts/gradle/SpeedTracker/Application/src/main/res/drawable-xxxhdpi/ic_launcher.png
+++ b/prebuilts/gradle/SpeedTracker/Application/src/main/res/drawable-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SpeedTracker/Application/src/main/res/values-v21/template-styles.xml b/prebuilts/gradle/SpeedTracker/Application/src/main/res/values-v21/template-styles.xml
deleted file mode 100644
index 134fcd9..0000000
--- a/prebuilts/gradle/SpeedTracker/Application/src/main/res/values-v21/template-styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  Copyright 2014 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>
-
-    <!-- Activity themes -->
-    <style name="Theme.Base" parent="android:Theme.Material.Light" />
-
-</resources>
diff --git a/prebuilts/gradle/SpeedTracker/Shared/build.gradle b/prebuilts/gradle/SpeedTracker/Shared/build.gradle
index 5978206..e6ddb59 100644
--- a/prebuilts/gradle/SpeedTracker/Shared/build.gradle
+++ b/prebuilts/gradle/SpeedTracker/Shared/build.gradle
@@ -19,9 +19,9 @@
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 20
 
-    buildToolsVersion  "21.0.0"
+    buildToolsVersion '20'
 
     sourceSets {
         main {
diff --git a/prebuilts/gradle/SpeedTracker/Wearable/build.gradle b/prebuilts/gradle/SpeedTracker/Wearable/build.gradle
index 3f041af..b8151b1 100644
--- a/prebuilts/gradle/SpeedTracker/Wearable/build.gradle
+++ b/prebuilts/gradle/SpeedTracker/Wearable/build.gradle
@@ -30,7 +30,7 @@
 android {
     compileSdkVersion 'android-20'
 
-    buildToolsVersion "21.0.0"
+    buildToolsVersion '20'
 
     buildTypes {
         release {
diff --git a/prebuilts/gradle/SpeedTracker/Wearable/src/main/java/com/example/android/wearable/speedtracker/WearableMainActivity.java b/prebuilts/gradle/SpeedTracker/Wearable/src/main/java/com/example/android/wearable/speedtracker/WearableMainActivity.java
index 9610f22..f3015bf 100644
--- a/prebuilts/gradle/SpeedTracker/Wearable/src/main/java/com/example/android/wearable/speedtracker/WearableMainActivity.java
+++ b/prebuilts/gradle/SpeedTracker/Wearable/src/main/java/com/example/android/wearable/speedtracker/WearableMainActivity.java
@@ -336,8 +336,8 @@
 
     private void updateRecordingIcon() {
         mSaveGpsLocation = LocationSettingActivity.getGpsRecordingStatusFromPreferences(this);
-        mSaveImageView.setImageResource(mSaveGpsLocation ? R.drawable.ic_file_download_googblue_24dp
-                : R.drawable.ic_file_download_grey600_24dp);
+        mSaveImageView.setImageResource(mSaveGpsLocation ? R.drawable.ic_gps_saving_grey600_96dp
+                : R.drawable.ic_gps_not_saving_grey600_96dp);
     }
 
     /**
diff --git a/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-hdpi/ic_launcher.png
index 2275b45..2476b11 100644
--- a/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-mdpi/ic_launcher.png
index 25015af..a102b79 100644
--- a/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xhdpi/ic_launcher.png
index 8aee870..8ad19e8 100644
--- a/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xhdpi/ic_launcher.png
+++ b/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxhdpi/ic_file_download_black_24dp.png b/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxhdpi/ic_file_download_black_24dp.png
deleted file mode 100644
index 0ec94b2..0000000
--- a/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxhdpi/ic_file_download_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxhdpi/ic_file_download_googblue_24dp.png b/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxhdpi/ic_file_download_googblue_24dp.png
deleted file mode 100644
index 00b3e05..0000000
--- a/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxhdpi/ic_file_download_googblue_24dp.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxhdpi/ic_file_download_grey600_24dp.png b/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxhdpi/ic_file_download_grey600_24dp.png
deleted file mode 100644
index c7e86f9..0000000
--- a/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxhdpi/ic_file_download_grey600_24dp.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png b/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png
deleted file mode 100644
index a57e72f..0000000
--- a/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxhdpi/ic_gps_not_saving_grey600_96dp.png b/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxhdpi/ic_gps_not_saving_grey600_96dp.png
new file mode 100644
index 0000000..0eff434
--- /dev/null
+++ b/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxhdpi/ic_gps_not_saving_grey600_96dp.png
Binary files differ
diff --git a/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxhdpi/ic_gps_saving_grey600_96dp.png b/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxhdpi/ic_gps_saving_grey600_96dp.png
new file mode 100644
index 0000000..7b3506b
--- /dev/null
+++ b/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxhdpi/ic_gps_saving_grey600_96dp.png
Binary files differ
diff --git a/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxhdpi/ic_launcher.png
index 7008a2f..9c5429f 100644
--- a/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ b/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxxhdpi/ic_launcher.png b/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxxhdpi/ic_launcher.png
index c31ab73..b2a49f8 100644
--- a/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxxhdpi/ic_launcher.png
+++ b/prebuilts/gradle/SpeedTracker/Wearable/src/main/res/drawable-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/build.gradle b/prebuilts/gradle/SynchronizedNotifications/Application/build.gradle
index 098d7fe..41fc623 100644
--- a/prebuilts/gradle/SynchronizedNotifications/Application/build.gradle
+++ b/prebuilts/gradle/SynchronizedNotifications/Application/build.gradle
@@ -30,14 +30,9 @@
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 20
 
-    buildToolsVersion  "21.0.0"
-
-    defaultConfig {
-        minSdkVersion 20
-        targetSdkVersion 21
-    }
+    buildToolsVersion "20"
 
     sourceSets {
         main {
diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/AndroidManifest.xml
index eb6a149..9d7df72 100644
--- a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/AndroidManifest.xml
+++ b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/AndroidManifest.xml
@@ -22,8 +22,8 @@
     android:versionCode="1"
     android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="19"
-        android:targetSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="18"
+        android:targetSdkVersion="20" />
 
     <application android:allowBackup="true"
         android:label="@string/app_name"
diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values-v21/template-styles.xml b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values-v21/template-styles.xml
deleted file mode 100644
index 134fcd9..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values-v21/template-styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  Copyright 2014 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>
-
-    <!-- Activity themes -->
-    <style name="Theme.Base" parent="android:Theme.Material.Light" />
-
-</resources>
diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/tests/AndroidManifest.xml b/prebuilts/gradle/SynchronizedNotifications/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 4c151ca..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/Application/tests/AndroidManifest.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2013 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 name must be unique so suffix with "tests" so package loader doesn't ignore us -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.example.android.wearable.synchronizednotifications.tests"
-          android:versionCode="1"
-          android:versionName="1.0">
-
-    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
-
-    <!-- We add an application tag here just so that we can indicate that
-         this package needs to link against the android.test library,
-         which is needed when building test cases. -->
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <!--
-    Specifies the instrumentation test runner used to run the tests.
-    -->
-    <instrumentation
-            android:name="android.test.InstrumentationTestRunner"
-            android:targetPackage="com.example.android.wearable.synchronizednotifications"
-            android:label="Tests for com.example.android.wearable.synchronizednotifications" />
-
-</manifest>
diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/tests/src/com/example/android/com/example/android/wearable/synchronizednotifications/tests/SampleTests.java b/prebuilts/gradle/SynchronizedNotifications/Application/tests/src/com/example/android/com/example/android/wearable/synchronizednotifications/tests/SampleTests.java
deleted file mode 100644
index 895b557..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/Application/tests/src/com/example/android/com/example/android/wearable/synchronizednotifications/tests/SampleTests.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-* Copyright (C) 2013 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.wearable.synchronizednotifications.tests;
-
-import com.example.android.wearable.synchronizednotifications.*;
-
-import android.test.ActivityInstrumentationTestCase2;
-
-/**
-* Tests for SynchronizedNotifications sample.
-*/
-public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
-
-    private MainActivity mTestActivity;
-    private SynchronizedNotificationsFragment mTestFragment;
-
-    public SampleTests() {
-        super(MainActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        // Starts the activity under test using the default Intent with:
-        // action = {@link Intent#ACTION_MAIN}
-        // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
-        // All other fields are null or empty.
-        mTestActivity = getActivity();
-        mTestFragment = (SynchronizedNotificationsFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
-    }
-
-    /**
-    * Test if the test fixture has been set up correctly.
-    */
-    public void testPreconditions() {
-        //Try to add a message to add context to your assertions. These messages will be shown if
-        //a tests fails and make it easy to understand why a test failed
-        assertNotNull("mTestActivity is null", mTestActivity);
-        assertNotNull("mTestFragment is null", mTestFragment);
-    }
-
-}
diff --git a/prebuilts/gradle/SynchronizedNotifications/Shared/build.gradle b/prebuilts/gradle/SynchronizedNotifications/Shared/build.gradle
index 5978206..e6ddb59 100644
--- a/prebuilts/gradle/SynchronizedNotifications/Shared/build.gradle
+++ b/prebuilts/gradle/SynchronizedNotifications/Shared/build.gradle
@@ -19,9 +19,9 @@
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 20
 
-    buildToolsVersion  "21.0.0"
+    buildToolsVersion '20'
 
     sourceSets {
         main {
diff --git a/prebuilts/gradle/SynchronizedNotifications/Wearable/build.gradle b/prebuilts/gradle/SynchronizedNotifications/Wearable/build.gradle
index 3f041af..b8151b1 100644
--- a/prebuilts/gradle/SynchronizedNotifications/Wearable/build.gradle
+++ b/prebuilts/gradle/SynchronizedNotifications/Wearable/build.gradle
@@ -30,7 +30,7 @@
 android {
     compileSdkVersion 'android-20'
 
-    buildToolsVersion "21.0.0"
+    buildToolsVersion '20'
 
     buildTypes {
         release {
diff --git a/prebuilts/gradle/Timer/Application/build.gradle b/prebuilts/gradle/Timer/Application/build.gradle
index 1b09073..0c6e001 100644
--- a/prebuilts/gradle/Timer/Application/build.gradle
+++ b/prebuilts/gradle/Timer/Application/build.gradle
@@ -29,14 +29,9 @@
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 20
 
-    buildToolsVersion  "21.0.0"
-
-    defaultConfig {
-        minSdkVersion 20
-        targetSdkVersion 21
-    }
+    buildToolsVersion "20"
 
     sourceSets {
         main {
diff --git a/prebuilts/gradle/Timer/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/Timer/Application/src/main/AndroidManifest.xml
index bd610eb..6b34b12 100644
--- a/prebuilts/gradle/Timer/Application/src/main/AndroidManifest.xml
+++ b/prebuilts/gradle/Timer/Application/src/main/AndroidManifest.xml
@@ -18,8 +18,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.android.wearable.timer">
 
-    <uses-sdk android:minSdkVersion="19"
-              android:targetSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="18"
+              android:targetSdkVersion="20" />
 
     <application android:allowBackup="true"
         android:label="@string/app_name">
diff --git a/prebuilts/gradle/Timer/Application/src/main/res/values-v21/template-styles.xml b/prebuilts/gradle/Timer/Application/src/main/res/values-v21/template-styles.xml
deleted file mode 100644
index 134fcd9..0000000
--- a/prebuilts/gradle/Timer/Application/src/main/res/values-v21/template-styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  Copyright 2014 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>
-
-    <!-- Activity themes -->
-    <style name="Theme.Base" parent="android:Theme.Material.Light" />
-
-</resources>
diff --git a/prebuilts/gradle/Timer/Shared/src/main/AndroidManifest.xml b/prebuilts/gradle/Timer/Shared/src/main/AndroidManifest.xml
deleted file mode 100644
index 6afc1b7..0000000
--- a/prebuilts/gradle/Timer/Shared/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.wearable.timer.common">
-
-    <application android:allowBackup="true"
-        android:label="@string/app_name">
-    </application>
-
-</manifest>
diff --git a/prebuilts/gradle/Timer/Shared/src/main/res/values/strings.xml b/prebuilts/gradle/Timer/Shared/src/main/res/values/strings.xml
deleted file mode 100644
index 0f2bb90..0000000
--- a/prebuilts/gradle/Timer/Shared/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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">Shared</string>
-</resources>
diff --git a/prebuilts/gradle/Timer/Wearable/build.gradle b/prebuilts/gradle/Timer/Wearable/build.gradle
index 483928f..864b2fd 100644
--- a/prebuilts/gradle/Timer/Wearable/build.gradle
+++ b/prebuilts/gradle/Timer/Wearable/build.gradle
@@ -29,7 +29,7 @@
 android {
     compileSdkVersion 'android-20'
 
-    buildToolsVersion  "21.0.0"
+    buildToolsVersion '20'
 
     buildTypes {
         release {
diff --git a/prebuilts/gradle/WatchViewStub/Application/build.gradle b/prebuilts/gradle/WatchViewStub/Application/build.gradle
index 1b09073..0c6e001 100644
--- a/prebuilts/gradle/WatchViewStub/Application/build.gradle
+++ b/prebuilts/gradle/WatchViewStub/Application/build.gradle
@@ -29,14 +29,9 @@
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 20
 
-    buildToolsVersion  "21.0.0"
-
-    defaultConfig {
-        minSdkVersion 20
-        targetSdkVersion 21
-    }
+    buildToolsVersion "20"
 
     sourceSets {
         main {
diff --git a/prebuilts/gradle/WatchViewStub/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/WatchViewStub/Application/src/main/AndroidManifest.xml
index e98a62f..d33b81f 100644
--- a/prebuilts/gradle/WatchViewStub/Application/src/main/AndroidManifest.xml
+++ b/prebuilts/gradle/WatchViewStub/Application/src/main/AndroidManifest.xml
@@ -18,8 +18,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.android.google.wearable.watchviewstub">
 
-    <uses-sdk android:minSdkVersion="19"
-              android:targetSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="18"
+              android:targetSdkVersion="20" />
 
     <application android:allowBackup="true"
         android:label="@string/app_name">
diff --git a/prebuilts/gradle/WatchViewStub/Application/src/main/res/values-v21/template-styles.xml b/prebuilts/gradle/WatchViewStub/Application/src/main/res/values-v21/template-styles.xml
deleted file mode 100644
index 134fcd9..0000000
--- a/prebuilts/gradle/WatchViewStub/Application/src/main/res/values-v21/template-styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  Copyright 2014 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>
-
-    <!-- Activity themes -->
-    <style name="Theme.Base" parent="android:Theme.Material.Light" />
-
-</resources>
diff --git a/prebuilts/gradle/WatchViewStub/Shared/src/main/AndroidManifest.xml b/prebuilts/gradle/WatchViewStub/Shared/src/main/AndroidManifest.xml
deleted file mode 100644
index 703d979..0000000
--- a/prebuilts/gradle/WatchViewStub/Shared/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.google.wearable.watchviewstub.common">
-
-    <application android:allowBackup="true"
-        android:label="@string/app_name">
-    </application>
-
-</manifest>
diff --git a/prebuilts/gradle/WatchViewStub/Shared/src/main/res/values/strings.xml b/prebuilts/gradle/WatchViewStub/Shared/src/main/res/values/strings.xml
deleted file mode 100644
index 0f2bb90..0000000
--- a/prebuilts/gradle/WatchViewStub/Shared/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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">Shared</string>
-</resources>
diff --git a/prebuilts/gradle/WatchViewStub/Wearable/build.gradle b/prebuilts/gradle/WatchViewStub/Wearable/build.gradle
index 483928f..864b2fd 100644
--- a/prebuilts/gradle/WatchViewStub/Wearable/build.gradle
+++ b/prebuilts/gradle/WatchViewStub/Wearable/build.gradle
@@ -29,7 +29,7 @@
 android {
     compileSdkVersion 'android-20'
 
-    buildToolsVersion  "21.0.0"
+    buildToolsVersion '20'
 
     buildTypes {
         release {