diff --git a/.gitignore b/.gitignore
index 03d41b2..627e46f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@
 out/
 src/common
 src/template
+_index.jd
 
 # Libraries used by the app
 # Can explicitly add if we want, but shouldn't do so blindly.  Licenses, bloat, etc.
@@ -38,4 +39,3 @@
 .gradle
 build/
 
-
diff --git a/background/alarms/repeatingAlarm/build.gradle b/background/alarms/repeatingAlarm/build.gradle
index 88331e3..cca9ac3 100644
--- a/background/alarms/repeatingAlarm/build.gradle
+++ b/background/alarms/repeatingAlarm/build.gradle
@@ -1,7 +1,10 @@
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
-    pathToBuild "../../../../../build"
-    pathToSamplesCommon "../../../common"
+  pathToBuild "../../../../../build"
+  pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/background/alarms/repeatingAlarm/repeatingAlarmSample/build.gradle b/background/alarms/repeatingAlarm/repeatingAlarmSample/build.gradle
index 241bcc7..069b740 100644
--- a/background/alarms/repeatingAlarm/repeatingAlarmSample/build.gradle
+++ b/background/alarms/repeatingAlarm/repeatingAlarmSample/build.gradle
@@ -1,11 +1,13 @@
 
+
+
 buildscript {
     repositories {
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.+'
+        classpath 'com.android.tools.build:gradle:0.6.+'
     }
 }
 
diff --git a/build.gradle b/build.gradle
index 046e4d2..b895091 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,6 +32,7 @@
 ]
 
 List<String> taskNames = [
+    "clean",
     "refresh",
     "build",
     "emitAnt",
diff --git a/connectivity/bluetooth/BluetoothLeGatt/build.gradle b/connectivity/bluetooth/BluetoothLeGatt/build.gradle
index ffb5c2f..cca9ac3 100644
--- a/connectivity/bluetooth/BluetoothLeGatt/build.gradle
+++ b/connectivity/bluetooth/BluetoothLeGatt/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/connectivity/network/BasicNetworking/build.gradle b/connectivity/network/BasicNetworking/build.gradle
index ffb5c2f..cca9ac3 100644
--- a/connectivity/network/BasicNetworking/build.gradle
+++ b/connectivity/network/BasicNetworking/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/connectivity/network/NetworkConnect/build.gradle b/connectivity/network/NetworkConnect/build.gradle
index ffb5c2f..cca9ac3 100644
--- a/connectivity/network/NetworkConnect/build.gradle
+++ b/connectivity/network/NetworkConnect/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/connectivity/sync/BasicSyncAdapter/build.gradle b/connectivity/sync/BasicSyncAdapter/build.gradle
index ffb5c2f..cca9ac3 100644
--- a/connectivity/sync/BasicSyncAdapter/build.gradle
+++ b/connectivity/sync/BasicSyncAdapter/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/content/contacts/BasicContactables/build.gradle b/content/contacts/BasicContactables/build.gradle
index ffb5c2f..cca9ac3 100644
--- a/content/contacts/BasicContactables/build.gradle
+++ b/content/contacts/BasicContactables/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/content/documentsUi/StorageClient/build.gradle b/content/documentsUi/StorageClient/build.gradle
index c7f6491..cca9ac3 100644
--- a/content/documentsUi/StorageClient/build.gradle
+++ b/content/documentsUi/StorageClient/build.gradle
@@ -1,8 +1,10 @@
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/content/multiuser/AppRestrictions/build.gradle b/content/multiuser/AppRestrictions/build.gradle
index ffb5c2f..cca9ac3 100644
--- a/content/multiuser/AppRestrictions/build.gradle
+++ b/content/multiuser/AppRestrictions/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/input/gestures/BasicGestureDetect/build.gradle b/input/gestures/BasicGestureDetect/build.gradle
index ffb5c2f..cca9ac3 100644
--- a/input/gestures/BasicGestureDetect/build.gradle
+++ b/input/gestures/BasicGestureDetect/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/input/multitouch/BasicMultitouch/build.gradle b/input/multitouch/BasicMultitouch/build.gradle
index ffb5c2f..cca9ac3 100644
--- a/input/multitouch/BasicMultitouch/build.gradle
+++ b/input/multitouch/BasicMultitouch/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/media/BasicMediaDecoder/build.gradle b/media/BasicMediaDecoder/build.gradle
index c886d80..c7a137e 100644
--- a/media/BasicMediaDecoder/build.gradle
+++ b/media/BasicMediaDecoder/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../build"
   pathToSamplesCommon "../../common"
 }
+apply from: "../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/media/BasicMediaRouter/build.gradle b/media/BasicMediaRouter/build.gradle
index c886d80..c7a137e 100644
--- a/media/BasicMediaRouter/build.gradle
+++ b/media/BasicMediaRouter/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../build"
   pathToSamplesCommon "../../common"
 }
+apply from: "../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/security/keystore/BasicAndroidKeyStore/build.gradle b/security/keystore/BasicAndroidKeyStore/build.gradle
index ffb5c2f..cca9ac3 100644
--- a/security/keystore/BasicAndroidKeyStore/build.gradle
+++ b/security/keystore/BasicAndroidKeyStore/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/testing/ActivityInstrumentation/build.gradle b/testing/ActivityInstrumentation/build.gradle
index c886d80..c7a137e 100644
--- a/testing/ActivityInstrumentation/build.gradle
+++ b/testing/ActivityInstrumentation/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../build"
   pathToSamplesCommon "../../common"
 }
+apply from: "../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/ui/accessibility/BasicAccessibility/build.gradle b/ui/accessibility/BasicAccessibility/build.gradle
index ffb5c2f..cca9ac3 100644
--- a/ui/accessibility/BasicAccessibility/build.gradle
+++ b/ui/accessibility/BasicAccessibility/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/ui/actionbar/DoneBar/build.gradle b/ui/actionbar/DoneBar/build.gradle
index ffb5c2f..cca9ac3 100644
--- a/ui/actionbar/DoneBar/build.gradle
+++ b/ui/actionbar/DoneBar/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/ui/actionbarcompat/Basic/build.gradle b/ui/actionbarcompat/Basic/build.gradle
index ffb5c2f..cca9ac3 100644
--- a/ui/actionbarcompat/Basic/build.gradle
+++ b/ui/actionbarcompat/Basic/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/ui/actionbarcompat/ListPopupMenu/build.gradle b/ui/actionbarcompat/ListPopupMenu/build.gradle
index ffb5c2f..cca9ac3 100644
--- a/ui/actionbarcompat/ListPopupMenu/build.gradle
+++ b/ui/actionbarcompat/ListPopupMenu/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/ui/actionbarcompat/ShareActionProvider/build.gradle b/ui/actionbarcompat/ShareActionProvider/build.gradle
index ffb5c2f..cca9ac3 100644
--- a/ui/actionbarcompat/ShareActionProvider/build.gradle
+++ b/ui/actionbarcompat/ShareActionProvider/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/ui/actionbarcompat/Styled/build.gradle b/ui/actionbarcompat/Styled/build.gradle
index ffb5c2f..cca9ac3 100644
--- a/ui/actionbarcompat/Styled/build.gradle
+++ b/ui/actionbarcompat/Styled/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/ui/holo/BorderlessButtons/build.gradle b/ui/holo/BorderlessButtons/build.gradle
index ffb5c2f..cca9ac3 100644
--- a/ui/holo/BorderlessButtons/build.gradle
+++ b/ui/holo/BorderlessButtons/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/ui/lists/CustomChoiceList/build.gradle b/ui/lists/CustomChoiceList/build.gradle
index ffb5c2f..cca9ac3 100644
--- a/ui/lists/CustomChoiceList/build.gradle
+++ b/ui/lists/CustomChoiceList/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/ui/notifications/BasicNotifications/build.gradle b/ui/notifications/BasicNotifications/build.gradle
index ffb5c2f..cca9ac3 100644
--- a/ui/notifications/BasicNotifications/build.gradle
+++ b/ui/notifications/BasicNotifications/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/ui/notifications/CustomNotifications/build.gradle b/ui/notifications/CustomNotifications/build.gradle
index ffb5c2f..cca9ac3 100644
--- a/ui/notifications/CustomNotifications/build.gradle
+++ b/ui/notifications/CustomNotifications/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/ui/views/HorizontalPaging/build.gradle b/ui/views/HorizontalPaging/build.gradle
index ffb5c2f..cca9ac3 100644
--- a/ui/views/HorizontalPaging/build.gradle
+++ b/ui/views/HorizontalPaging/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/ui/views/TextSwitcher/build.gradle b/ui/views/TextSwitcher/build.gradle
index ffb5c2f..cca9ac3 100644
--- a/ui/views/TextSwitcher/build.gradle
+++ b/ui/views/TextSwitcher/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/ui/window/AdvancedImmersiveMode/build.gradle b/ui/window/AdvancedImmersiveMode/build.gradle
index c7f6491..cca9ac3 100644
--- a/ui/window/AdvancedImmersiveMode/build.gradle
+++ b/ui/window/AdvancedImmersiveMode/build.gradle
@@ -1,8 +1,10 @@
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/ui/window/BasicImmersiveMode/build.gradle b/ui/window/BasicImmersiveMode/build.gradle
index ffb5c2f..cca9ac3 100644
--- a/ui/window/BasicImmersiveMode/build.gradle
+++ b/ui/window/BasicImmersiveMode/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/ui/window/ImmersiveMode/build.gradle b/ui/window/ImmersiveMode/build.gradle
index ffb5c2f..cca9ac3 100644
--- a/ui/window/ImmersiveMode/build.gradle
+++ b/ui/window/ImmersiveMode/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../../build"
   pathToSamplesCommon "../../../common"
 }
+apply from: "../../../../../build/build.gradle"
 // END_EXCLUDE
diff --git a/views/TextLinkify/build.gradle b/views/TextLinkify/build.gradle
index c886d80..c7a137e 100644
--- a/views/TextLinkify/build.gradle
+++ b/views/TextLinkify/build.gradle
@@ -1,11 +1,10 @@
-
-
-
-
 // BEGIN_EXCLUDE
-apply from: "../../../../build/build.gradle"
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
 samplegen {
   pathToBuild "../../../../build"
   pathToSamplesCommon "../../common"
 }
+apply from: "../../../../build/build.gradle"
 // END_EXCLUDE