diff --git a/build.gradle b/build.gradle
index b84829d..6b1369a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -121,7 +121,11 @@
 List<String> taskNames = [
     "clean",
     "refresh",
+    "assembleDebug",
     "build",
+    "check",
+    "connectedCheck",
+    "deviceCheck",
     "emitAnt",
     "emitGradle",
     "emitBrowseable",
diff --git a/connectivity/network/BasicNetworking/template-params.xml b/connectivity/network/BasicNetworking/template-params.xml
index efdabbd..a59c6f9 100644
--- a/connectivity/network/BasicNetworking/template-params.xml
+++ b/connectivity/network/BasicNetworking/template-params.xml
@@ -20,7 +20,7 @@
     <package>com.example.android.basicnetworking</package>
 
     <!-- change minSdk if needed-->
-    <minSdk>4</minSdk>
+    <minSdk>7</minSdk>
 
     <strings>
         <intro>
diff --git a/connectivity/sync/BasicSyncAdapter/Application/src/main/res/values/attrs.xml b/connectivity/sync/BasicSyncAdapter/Application/src/main/res/values/attrs.xml
deleted file mode 100644
index 6c15504..0000000
--- a/connectivity/sync/BasicSyncAdapter/Application/src/main/res/values/attrs.xml
+++ /dev/null
@@ -1,21 +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.
--->
-
-<resources>
-    <!-- Specifies a style resource to use for an indeterminate progress spinner. -->
-    <attr name="indeterminateProgressStyle" format="reference"/>
-</resources>
\ No newline at end of file
diff --git a/content/documentsUi/ScopedDirectoryAccess/template-params.xml b/content/documentsUi/ScopedDirectoryAccess/template-params.xml
index d008782..8116116 100644
--- a/content/documentsUi/ScopedDirectoryAccess/template-params.xml
+++ b/content/documentsUi/ScopedDirectoryAccess/template-params.xml
@@ -26,9 +26,8 @@
     <targetSdkVersion>24</targetSdkVersion>
 
     <!-- Include additional dependencies here.-->
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
-    <dependency>com.android.support:recyclerview-v7:24.0.0-beta1</dependency>
-    <dependency>com.android.support:support-v4:24.0.0-beta1</dependency>
+    <dependency>com.android.support:recyclerview-v7:24.0.0</dependency>
+    <dependency>com.android.support:support-v4:24.0.0</dependency>
 
     <template src="base" />
 
diff --git a/media/Camera2Basic/template-params.xml b/media/Camera2Basic/template-params.xml
index 7b42427..905ba7f 100644
--- a/media/Camera2Basic/template-params.xml
+++ b/media/Camera2Basic/template-params.xml
@@ -22,7 +22,6 @@
     <group>Media</group>
     <package>com.example.android.camera2basic</package>
 
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
     <minSdk>21</minSdk>
     <strings>
         <intro>
diff --git a/media/Camera2Raw/template-params.xml b/media/Camera2Raw/template-params.xml
index b33ebf1..e0072c7 100644
--- a/media/Camera2Raw/template-params.xml
+++ b/media/Camera2Raw/template-params.xml
@@ -20,7 +20,6 @@
     <group>Media</group>
     <package>com.example.android.camera2raw</package>
 
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
     <minSdk>21</minSdk>
 
     <strings>
diff --git a/media/Camera2Video/template-params.xml b/media/Camera2Video/template-params.xml
index 19e3470..6b76900 100644
--- a/media/Camera2Video/template-params.xml
+++ b/media/Camera2Video/template-params.xml
@@ -20,7 +20,6 @@
     <group>Media</group>
     <package>com.example.android.camera2video</package>
 
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
     <minSdk>21</minSdk>
 
     <strings>
diff --git a/media/HdrViewfinder/template-params.xml b/media/HdrViewfinder/template-params.xml
index bac0992..d63c099 100644
--- a/media/HdrViewfinder/template-params.xml
+++ b/media/HdrViewfinder/template-params.xml
@@ -21,7 +21,7 @@
 
     <minSdk>21</minSdk>
 
-    <dependency>com.android.support:design:24.0.0-beta1</dependency>
+    <dependency>com.android.support:design:24.0.0</dependency>
 
     <strings>
         <intro>
diff --git a/media/MediaRouter/template-params.xml b/media/MediaRouter/template-params.xml
index 5f2a563..647c487 100644
--- a/media/MediaRouter/template-params.xml
+++ b/media/MediaRouter/template-params.xml
@@ -27,8 +27,7 @@
     <!-- change minSdk if needed-->
     <minSdk>13</minSdk>
 
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
-    <dependency>com.android.support:mediarouter-v7:24.0.0-beta1</dependency>
+    <dependency>com.android.support:mediarouter-v7:24.0.0</dependency>
 
 
     <strings>
diff --git a/renderScript/BasicRenderScript/Application/src/main/res/values/attrs.xml b/renderScript/BasicRenderScript/Application/src/main/res/values/attrs.xml
deleted file mode 100644
index e67df0a..0000000
--- a/renderScript/BasicRenderScript/Application/src/main/res/values/attrs.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<resources>
-
-    <!--
-         Declare custom theme attributes that allow changing which styles are
-         used for button bars depending on the API level.
-         ?android:attr/buttonBarStyle is new as of API 11 so this is
-         necessary to support previous API levels.
-    -->
-    <declare-styleable name="ButtonBarContainerTheme">
-        <attr name="buttonBarStyle" format="reference" />
-        <attr name="buttonBarButtonStyle" format="reference" />
-    </declare-styleable>
-
-</resources>
diff --git a/renderScript/RenderScriptIntrinsic/Application/src/main/res/values/attrs.xml b/renderScript/RenderScriptIntrinsic/Application/src/main/res/values/attrs.xml
deleted file mode 100644
index e67df0a..0000000
--- a/renderScript/RenderScriptIntrinsic/Application/src/main/res/values/attrs.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<resources>
-
-    <!--
-         Declare custom theme attributes that allow changing which styles are
-         used for button bars depending on the API level.
-         ?android:attr/buttonBarStyle is new as of API 11 so this is
-         necessary to support previous API levels.
-    -->
-    <declare-styleable name="ButtonBarContainerTheme">
-        <attr name="buttonBarStyle" format="reference" />
-        <attr name="buttonBarButtonStyle" format="reference" />
-    </declare-styleable>
-
-</resources>
diff --git a/security/DirectBoot/template-params.xml b/security/DirectBoot/template-params.xml
index ec45fcf..dd5d5b1 100644
--- a/security/DirectBoot/template-params.xml
+++ b/security/DirectBoot/template-params.xml
@@ -27,11 +27,8 @@
 
     <!-- Include additional dependencies here.-->
     <!-- dependency>com.google.android.gms:play-services:5.0.+</dependency -->
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
-    <dependency>com.android.support:support-v4:24.0.0-beta1</dependency>
-    <dependency>com.android.support:support-v13:24.0.0-beta1</dependency>
-    <dependency>com.android.support:recyclerview-v7:24.0.0-beta1</dependency>
-    <dependency>com.android.support:design:24.0.0-beta1</dependency>
+    <dependency>com.android.support:recyclerview-v7:24.0.0</dependency>
+    <dependency>com.android.support:design:24.0.0</dependency>
 
     <template src="base" />
 
diff --git a/system/RuntimePermissions/template-params.xml b/system/RuntimePermissions/template-params.xml
index a12be33..c766f9b 100644
--- a/system/RuntimePermissions/template-params.xml
+++ b/system/RuntimePermissions/template-params.xml
@@ -21,9 +21,8 @@
 
     <minSdk>15</minSdk>
 
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
-    <dependency>com.android.support:support-v4:24.0.0-beta1</dependency>
-    <dependency>com.android.support:design:24.0.0-beta1</dependency>
+    <dependency>com.android.support:support-v4:24.0.0</dependency>
+    <dependency>com.android.support:design:24.0.0</dependency>
 
     <strings>
         <intro>
diff --git a/system/RuntimePermissionsBasic/template-params.xml b/system/RuntimePermissionsBasic/template-params.xml
index 8900091..c5852ed 100644
--- a/system/RuntimePermissionsBasic/template-params.xml
+++ b/system/RuntimePermissionsBasic/template-params.xml
@@ -21,9 +21,8 @@
 
     <minSdk>15</minSdk>
 
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
-    <dependency>com.android.support:support-v4:24.0.0-beta1</dependency>
-    <dependency>com.android.support:design:24.0.0-beta1</dependency>
+    <dependency>com.android.support:support-v4:24.0.0</dependency>
+    <dependency>com.android.support:design:24.0.0</dependency>
 
     <strings>
         <intro>
diff --git a/testing/ActivityInstrumentation/template-params.xml b/testing/ActivityInstrumentation/template-params.xml
index 4856a82..1e248d5 100644
--- a/testing/ActivityInstrumentation/template-params.xml
+++ b/testing/ActivityInstrumentation/template-params.xml
@@ -21,7 +21,7 @@
 
 
     <!-- change minSdk if needed-->
-    <minSdk>4</minSdk>
+    <minSdk>7</minSdk>
 
 
     <strings>
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/template-params.xml b/ui/actionbarcompat/ActionBarCompat-Basic/template-params.xml
index 5c65595..ffb0de5 100644
--- a/ui/actionbarcompat/ActionBarCompat-Basic/template-params.xml
+++ b/ui/actionbarcompat/ActionBarCompat-Basic/template-params.xml
@@ -19,8 +19,6 @@
     <group>UI</group>
     <package>com.example.android.actionbarcompat.basic</package>
 
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
-
     <!-- change minSdk if needed-->
     <minSdk>7</minSdk>
 
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/template-params.xml b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/template-params.xml
index acb2c3a..930a293 100644
--- a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/template-params.xml
+++ b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/template-params.xml
@@ -19,8 +19,6 @@
     <group>UI</group>
     <package>com.example.android.actionbarcompat.listpopupmenu</package>
 
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
-
     <!-- change minSdk if needed-->
     <minSdk>7</minSdk>
 
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/template-params.xml b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/template-params.xml
index 4d95c7b..76d316a 100644
--- a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/template-params.xml
+++ b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/template-params.xml
@@ -19,9 +19,6 @@
     <group>UI</group>
     <package>com.example.android.actionbarcompat.shareactionprovider</package>
 
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
-
-    <!-- change minSdk if needed-->
     <minSdk>7</minSdk>
 
     <strings>
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/template-params.xml b/ui/actionbarcompat/ActionBarCompat-Styled/template-params.xml
index 7952b5f..4e0c8e7 100644
--- a/ui/actionbarcompat/ActionBarCompat-Styled/template-params.xml
+++ b/ui/actionbarcompat/ActionBarCompat-Styled/template-params.xml
@@ -19,8 +19,6 @@
     <group>UI</group>
     <package>com.example.android.actionbarcompat.styled</package>
 
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
-
     <!-- change minSdk if needed-->
     <minSdk>7</minSdk>
 
diff --git a/ui/lists/CustomChoiceList/template-params.xml b/ui/lists/CustomChoiceList/template-params.xml
index 35626fc..d42ba2b 100644
--- a/ui/lists/CustomChoiceList/template-params.xml
+++ b/ui/lists/CustomChoiceList/template-params.xml
@@ -20,7 +20,7 @@
     <package>com.example.android.customchoicelist</package>
 
     <!-- change minSdk if needed-->
-    <minSdk>4</minSdk>
+    <minSdk>7</minSdk>
 
     <strings>
         <intro>
diff --git a/ui/views/CardView/template-params.xml b/ui/views/CardView/template-params.xml
index 30ff32f..3ce856f 100644
--- a/ui/views/CardView/template-params.xml
+++ b/ui/views/CardView/template-params.xml
@@ -27,7 +27,7 @@
     <!-- change minSdk if needed-->
     <minSdk>21</minSdk>
 
-    <dependency>com.android.support:cardview-v7:24.0.0-beta1</dependency>
+    <dependency>com.android.support:cardview-v7:24.0.0</dependency>
 
     <strings>
         <intro>
diff --git a/ui/views/NavigationDrawer/template-params.xml b/ui/views/NavigationDrawer/template-params.xml
index 12ea60a..b33af7c 100644
--- a/ui/views/NavigationDrawer/template-params.xml
+++ b/ui/views/NavigationDrawer/template-params.xml
@@ -27,10 +27,10 @@
     <!-- change minSdk if needed-->
     <minSdk>21</minSdk>
 
-    <dependency>com.android.support:support-v13:24.0.0-beta1</dependency>
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
-    <dependency>com.android.support:recyclerview-v7:24.0.0-beta1</dependency>
-    <dependency>com.android.support:cardview-v7:24.0.0-beta1</dependency>
+    <dependency>com.android.support:support-v13:24.0.0</dependency>
+    <dependency>com.android.support:appcompat-v7:24.0.0</dependency>
+    <dependency>com.android.support:recyclerview-v7:24.0.0</dependency>
+    <dependency>com.android.support:cardview-v7:24.0.0</dependency>
 
     <strings>
         <intro>
diff --git a/ui/views/RecyclerView/template-params.xml b/ui/views/RecyclerView/template-params.xml
index 262fb17..2634a07 100644
--- a/ui/views/RecyclerView/template-params.xml
+++ b/ui/views/RecyclerView/template-params.xml
@@ -22,7 +22,7 @@
     <group>UI</group>
     <package>com.example.android.recyclerview</package>
 
-    <dependency>com.android.support:recyclerview-v7:24.0.0-beta1</dependency>
+    <dependency>com.android.support:recyclerview-v7:24.0.0</dependency>
 
     <!-- change minSdk if needed-->
     <minSdk>7</minSdk>
diff --git a/ui/views/TextSwitcher/template-params.xml b/ui/views/TextSwitcher/template-params.xml
index f29e2cd..b57e228 100644
--- a/ui/views/TextSwitcher/template-params.xml
+++ b/ui/views/TextSwitcher/template-params.xml
@@ -20,7 +20,7 @@
     <package>com.example.android.textswitcher</package>
 
     <!-- change minSdk if needed-->
-    <minSdk>4</minSdk>
+    <minSdk>7</minSdk>
 
     <strings>
         <intro>
diff --git a/views/TextLinkify/template-params.xml b/views/TextLinkify/template-params.xml
index 72c3437..de4d5f7 100644
--- a/views/TextLinkify/template-params.xml
+++ b/views/TextLinkify/template-params.xml
@@ -21,7 +21,7 @@
     <package>com.example.android.textlinkify</package>
 
     <!-- change minSdk if needed-->
-    <minSdk>4</minSdk>
+    <minSdk>7</minSdk>
 
     <strings>
         <intro>
diff --git a/wearable/wear/AgendaData/template-params.xml b/wearable/wear/AgendaData/template-params.xml
index e1dea3b..0114403 100644
--- a/wearable/wear/AgendaData/template-params.xml
+++ b/wearable/wear/AgendaData/template-params.xml
@@ -26,7 +26,7 @@
     <targetSdkVersion>23</targetSdkVersion>
     <targetSdkVersionWear>23</targetSdkVersionWear>
 
-    <dependency>com.android.support:design:24.0.0-beta1</dependency>
+    <dependency>com.android.support:design:24.0.0</dependency>
 
     <wearable>
         <has_handheld_app>true</has_handheld_app>
diff --git a/wearable/wear/RuntimePermissionsWear/template-params.xml b/wearable/wear/RuntimePermissionsWear/template-params.xml
index a197fec..cdbeef7 100644
--- a/wearable/wear/RuntimePermissionsWear/template-params.xml
+++ b/wearable/wear/RuntimePermissionsWear/template-params.xml
@@ -28,8 +28,8 @@
         <has_handheld_app>true</has_handheld_app>
     </wearable>
 
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
-    <dependency>com.android.support:design:24.0.0-beta1</dependency>
+    <dependency>com.android.support:appcompat-v7:24.0.0</dependency>
+    <dependency>com.android.support:design:24.0.0</dependency>
     <provided_dependency_wearable>com.google.android.wearable:wearable:1.4.0</provided_dependency_wearable>
 
     <strings>
diff --git a/wearable/wear/SpeedTracker/template-params.xml b/wearable/wear/SpeedTracker/template-params.xml
index b4e3d44..93c88f8 100644
--- a/wearable/wear/SpeedTracker/template-params.xml
+++ b/wearable/wear/SpeedTracker/template-params.xml
@@ -30,7 +30,7 @@
         <has_handheld_app>true</has_handheld_app>
     </wearable>
 
-    <dependency>com.android.support:design:24.0.0-beta1</dependency>
+    <dependency>com.android.support:design:24.0.0</dependency>
 
     <dependency>com.google.android.gms:play-services-location</dependency>
     <dependency_wearable>com.google.android.gms:play-services-location</dependency_wearable>
diff --git a/wearable/wear/XYZTouristAttractions/template-params.xml b/wearable/wear/XYZTouristAttractions/template-params.xml
index 59239ca..35de838 100644
--- a/wearable/wear/XYZTouristAttractions/template-params.xml
+++ b/wearable/wear/XYZTouristAttractions/template-params.xml
@@ -29,9 +29,9 @@
     <dependency>com.google.android.gms:play-services-location</dependency>
     <dependency>com.google.maps.android:android-maps-utils:0.3.4</dependency>
     <dependency>com.github.bumptech.glide:glide:3.6.1</dependency>
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
-    <dependency>com.android.support:recyclerview-v7:24.0.0-beta1</dependency>
-    <dependency>com.android.support:design:24.0.0-beta1</dependency>
+    <dependency>com.android.support:appcompat-v7:24.0.0</dependency>
+    <dependency>com.android.support:recyclerview-v7:24.0.0</dependency>
+    <dependency>com.android.support:design:24.0.0</dependency>
     <dependency_wearable>com.google.android.gms:play-services-location</dependency_wearable>
     <dependency_shared>com.android.support:support-v13:23.0.0</dependency_shared>
     <dependency_shared>com.google.android.gms:play-services-wearable</dependency_shared>