Rename projects.

637 files changed, 55 insertions, 161 deletions

diff --git a/robolectric-annotations/build.gradle b/annotations/build.gradle
index a5ab11aba..79c61f44f 100644
--- a/robolectric-annotations/build.gradle
+++ b/annotations/build.gradle
@@ -8,7 +8,7 @@ new RoboJavaModulePlugin(
 
 dependencies {
     // Compile dependencies
-    compile project(":shadow-api")
+    compile project(":shadowapi")
     compileOnly "com.google.code.findbugs:jsr305:3.0.1"
     compileOnly AndroidSdk.MAX_SDK.coordinates
 }
\ No newline at end of file
diff --git a/robolectric-annotations/src/main/java/org/robolectric/annotation/AccessibilityChecks.java b/annotations/src/main/java/org/robolectric/annotation/AccessibilityChecks.java
index f62d15561..f62d15561 100644
--- a/robolectric-annotations/src/main/java/org/robolectric/annotation/AccessibilityChecks.java
+++ b/annotations/src/main/java/org/robolectric/annotation/AccessibilityChecks.java
diff --git a/robolectric-annotations/src/main/java/org/robolectric/annotation/Config.java b/annotations/src/main/java/org/robolectric/annotation/Config.java
index ecc2dfe2b..ecc2dfe2b 100644
--- a/robolectric-annotations/src/main/java/org/robolectric/annotation/Config.java
+++ b/annotations/src/main/java/org/robolectric/annotation/Config.java
diff --git a/robolectric-annotations/src/main/java/org/robolectric/annotation/DefaultApplication.java b/annotations/src/main/java/org/robolectric/annotation/DefaultApplication.java
index d2f6b97af..d2f6b97af 100644
--- a/robolectric-annotations/src/main/java/org/robolectric/annotation/DefaultApplication.java
+++ b/annotations/src/main/java/org/robolectric/annotation/DefaultApplication.java
diff --git a/robolectric-annotations/src/main/java/org/robolectric/annotation/HiddenApi.java b/annotations/src/main/java/org/robolectric/annotation/HiddenApi.java
index a5e658e5e..a5e658e5e 100644
--- a/robolectric-annotations/src/main/java/org/robolectric/annotation/HiddenApi.java
+++ b/annotations/src/main/java/org/robolectric/annotation/HiddenApi.java
diff --git a/robolectric-annotations/src/main/java/org/robolectric/annotation/Implementation.java b/annotations/src/main/java/org/robolectric/annotation/Implementation.java
index ca699ee26..ca699ee26 100644
--- a/robolectric-annotations/src/main/java/org/robolectric/annotation/Implementation.java
+++ b/annotations/src/main/java/org/robolectric/annotation/Implementation.java
diff --git a/robolectric-annotations/src/main/java/org/robolectric/annotation/Implements.java b/annotations/src/main/java/org/robolectric/annotation/Implements.java
index ff4538bf0..ff4538bf0 100644
--- a/robolectric-annotations/src/main/java/org/robolectric/annotation/Implements.java
+++ b/annotations/src/main/java/org/robolectric/annotation/Implements.java
diff --git a/robolectric-annotations/src/main/java/org/robolectric/annotation/RealObject.java b/annotations/src/main/java/org/robolectric/annotation/RealObject.java
index 604007760..604007760 100644
--- a/robolectric-annotations/src/main/java/org/robolectric/annotation/RealObject.java
+++ b/annotations/src/main/java/org/robolectric/annotation/RealObject.java
diff --git a/robolectric-annotations/src/main/java/org/robolectric/annotation/Resetter.java b/annotations/src/main/java/org/robolectric/annotation/Resetter.java
index 188420977..188420977 100644
--- a/robolectric-annotations/src/main/java/org/robolectric/annotation/Resetter.java
+++ b/annotations/src/main/java/org/robolectric/annotation/Resetter.java
diff --git a/robolectric-annotations/src/main/java/org/robolectric/annotation/internal/ConfigUtils.java b/annotations/src/main/java/org/robolectric/annotation/internal/ConfigUtils.java
index ed4a19a14..ed4a19a14 100644
--- a/robolectric-annotations/src/main/java/org/robolectric/annotation/internal/ConfigUtils.java
+++ b/annotations/src/main/java/org/robolectric/annotation/internal/ConfigUtils.java
diff --git a/robolectric-annotations/src/main/java/org/robolectric/annotation/package-info.java b/annotations/src/main/java/org/robolectric/annotation/package-info.java
index 4a71fe767..4a71fe767 100644
--- a/robolectric-annotations/src/main/java/org/robolectric/annotation/package-info.java
+++ b/annotations/src/main/java/org/robolectric/annotation/package-info.java
diff --git a/buildSrc/src/main/groovy/ProvideBuildClasspathTask.groovy b/buildSrc/src/main/groovy/ProvideBuildClasspathTask.groovy
index 81e21d4b5..68a424f82 100644
--- a/buildSrc/src/main/groovy/ProvideBuildClasspathTask.groovy
+++ b/buildSrc/src/main/groovy/ProvideBuildClasspathTask.groovy
@@ -10,7 +10,7 @@ class ProvideBuildClasspathTask extends DefaultTask {
         final List<String> paths = new ArrayList<>()
 
         project.rootProject.allprojects.each { Project otherProject ->
-            def match = otherProject.name =~ /robolectric-shadows\/(.*)/
+            def match = otherProject.name =~ /shadows\/(.*)/
             if (match.matches()) {
                 def artifactName = "${otherProject.group}:${otherProject.mavenArtifactName}:${otherProject.version}"
                 File classesDir = otherProject.sourceSets['main'].output.classesDir
diff --git a/buildSrc/src/main/groovy/RoboJavaModulePlugin.groovy b/buildSrc/src/main/groovy/RoboJavaModulePlugin.groovy
index 36a0d1bc6..eecea5fe7 100644
--- a/buildSrc/src/main/groovy/RoboJavaModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/RoboJavaModulePlugin.groovy
@@ -42,7 +42,7 @@ class RoboJavaModulePlugin implements Plugin<Project> {
 
         def mavenArtifactName = {
             def projNameParts = project.name.split(/\//) as List
-            if (projNameParts[0] == "robolectric-shadows") {
+            if (projNameParts[0] == "shadows") {
                 projNameParts = projNameParts.drop(1)
                 return projNameParts.join("-")
             } else {
diff --git a/buildSrc/src/main/groovy/ShadowsPlugin.groovy b/buildSrc/src/main/groovy/ShadowsPlugin.groovy
index 86cfef6d4..7b61e64f0 100644
--- a/buildSrc/src/main/groovy/ShadowsPlugin.groovy
+++ b/buildSrc/src/main/groovy/ShadowsPlugin.groovy
@@ -14,7 +14,7 @@ class ShadowsPlugin implements Plugin<Project> {
         }
 
         project.dependencies {
-            robolectricProcessor project.project(":robolectric-processor")
+            robolectricProcessor project.project(":processor")
         }
 
         def generatedSourcesDir = "${project.buildDir}/generated-shadows"
diff --git a/robolectric-junit/build.gradle b/junit/build.gradle
index a478c3050..884edf662 100644
--- a/robolectric-junit/build.gradle
+++ b/junit/build.gradle
@@ -8,9 +8,9 @@ new RoboJavaModulePlugin(
 
 dependencies {
     // Compile dependencies
-    compile project(":robolectric-annotations")
-    compile project(":robolectric-sandbox")
-    compile project(":shadow-api")
+    compile project(":annotations")
+    compile project(":sandbox")
+    compile project(":shadowapi")
 
     compileOnly "com.google.code.findbugs:jsr305:3.0.1"
     compileOnly "junit:junit:4.12"
diff --git a/robolectric-junit/src/main/java/org/robolectric/internal/SandboxTestRunner.java b/junit/src/main/java/org/robolectric/internal/SandboxTestRunner.java
index 73b51e42a..73b51e42a 100644
--- a/robolectric-junit/src/main/java/org/robolectric/internal/SandboxTestRunner.java
+++ b/junit/src/main/java/org/robolectric/internal/SandboxTestRunner.java
diff --git a/robolectric-processor/README.md b/processor/README.md
index 82dc6ea88..82dc6ea88 100644
--- a/robolectric-processor/README.md
+++ b/processor/README.md
diff --git a/robolectric-processor/build.gradle b/processor/build.gradle
index b3c1675c4..c7a33f294 100644
--- a/robolectric-processor/build.gradle
+++ b/processor/build.gradle
@@ -9,7 +9,7 @@ new RoboJavaModulePlugin(
 
 dependencies {
     // Project dependencies
-    compile project(":robolectric-annotations")
+    compile project(":annotations")
 
     // Compile dependencies
     compile "com.google.guava:guava:20.0"
diff --git a/robolectric-processor/images/RealObject-error.png b/processor/images/RealObject-error.png
index 923650bb1..923650bb1 100644
--- a/robolectric-processor/images/RealObject-error.png
+++ b/processor/images/RealObject-error.png
diff --git a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/DocumentedElement.java b/processor/src/main/java/org/robolectric/annotation/processing/DocumentedElement.java
index fb8504862..fb8504862 100644
--- a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/DocumentedElement.java
+++ b/processor/src/main/java/org/robolectric/annotation/processing/DocumentedElement.java
diff --git a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/DocumentedMethod.java b/processor/src/main/java/org/robolectric/annotation/processing/DocumentedMethod.java
index 727e05712..727e05712 100644
--- a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/DocumentedMethod.java
+++ b/processor/src/main/java/org/robolectric/annotation/processing/DocumentedMethod.java
diff --git a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/DocumentedPackage.java b/processor/src/main/java/org/robolectric/annotation/processing/DocumentedPackage.java
index 307cbdaf1..307cbdaf1 100644
--- a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/DocumentedPackage.java
+++ b/processor/src/main/java/org/robolectric/annotation/processing/DocumentedPackage.java
diff --git a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/DocumentedType.java b/processor/src/main/java/org/robolectric/annotation/processing/DocumentedType.java
index 0063211e3..0063211e3 100644
--- a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/DocumentedType.java
+++ b/processor/src/main/java/org/robolectric/annotation/processing/DocumentedType.java
diff --git a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/RobolectricModel.java b/processor/src/main/java/org/robolectric/annotation/processing/RobolectricModel.java
index 979653489..979653489 100644
--- a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/RobolectricModel.java
+++ b/processor/src/main/java/org/robolectric/annotation/processing/RobolectricModel.java
diff --git a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/RobolectricProcessor.java b/processor/src/main/java/org/robolectric/annotation/processing/RobolectricProcessor.java
index c4ca342df..c4ca342df 100644
--- a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/RobolectricProcessor.java
+++ b/processor/src/main/java/org/robolectric/annotation/processing/RobolectricProcessor.java
diff --git a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/generator/Generator.java b/processor/src/main/java/org/robolectric/annotation/processing/generator/Generator.java
index b78197b91..b78197b91 100644
--- a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/generator/Generator.java
+++ b/processor/src/main/java/org/robolectric/annotation/processing/generator/Generator.java
diff --git a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/generator/JavadocJsonGenerator.java b/processor/src/main/java/org/robolectric/annotation/processing/generator/JavadocJsonGenerator.java
index 69a368ca3..69a368ca3 100644
--- a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/generator/JavadocJsonGenerator.java
+++ b/processor/src/main/java/org/robolectric/annotation/processing/generator/JavadocJsonGenerator.java
diff --git a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/generator/ServiceLoaderGenerator.java b/processor/src/main/java/org/robolectric/annotation/processing/generator/ServiceLoaderGenerator.java
index fe839ff32..fe839ff32 100644
--- a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/generator/ServiceLoaderGenerator.java
+++ b/processor/src/main/java/org/robolectric/annotation/processing/generator/ServiceLoaderGenerator.java
diff --git a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/generator/ShadowProviderGenerator.java b/processor/src/main/java/org/robolectric/annotation/processing/generator/ShadowProviderGenerator.java
index 0cbf513a9..0cbf513a9 100644
--- a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/generator/ShadowProviderGenerator.java
+++ b/processor/src/main/java/org/robolectric/annotation/processing/generator/ShadowProviderGenerator.java
diff --git a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/generator/package-info.java b/processor/src/main/java/org/robolectric/annotation/processing/generator/package-info.java
index 0701d873d..0701d873d 100644
--- a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/generator/package-info.java
+++ b/processor/src/main/java/org/robolectric/annotation/processing/generator/package-info.java
diff --git a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/package-info.java b/processor/src/main/java/org/robolectric/annotation/processing/package-info.java
index eb5007e39..eb5007e39 100644
--- a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/package-info.java
+++ b/processor/src/main/java/org/robolectric/annotation/processing/package-info.java
diff --git a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/validator/FoundOnImplementsValidator.java b/processor/src/main/java/org/robolectric/annotation/processing/validator/FoundOnImplementsValidator.java
index 93c7376ff..93c7376ff 100644
--- a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/validator/FoundOnImplementsValidator.java
+++ b/processor/src/main/java/org/robolectric/annotation/processing/validator/FoundOnImplementsValidator.java
diff --git a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/validator/ImplementationValidator.java b/processor/src/main/java/org/robolectric/annotation/processing/validator/ImplementationValidator.java
index f605bd775..f605bd775 100644
--- a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/validator/ImplementationValidator.java
+++ b/processor/src/main/java/org/robolectric/annotation/processing/validator/ImplementationValidator.java
diff --git a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/validator/ImplementsValidator.java b/processor/src/main/java/org/robolectric/annotation/processing/validator/ImplementsValidator.java
index fa756f336..fa756f336 100644
--- a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/validator/ImplementsValidator.java
+++ b/processor/src/main/java/org/robolectric/annotation/processing/validator/ImplementsValidator.java
diff --git a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/validator/RealObjectValidator.java b/processor/src/main/java/org/robolectric/annotation/processing/validator/RealObjectValidator.java
index d968816ae..d968816ae 100644
--- a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/validator/RealObjectValidator.java
+++ b/processor/src/main/java/org/robolectric/annotation/processing/validator/RealObjectValidator.java
diff --git a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/validator/ResetterValidator.java b/processor/src/main/java/org/robolectric/annotation/processing/validator/ResetterValidator.java
index 7d4400bd4..7d4400bd4 100644
--- a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/validator/ResetterValidator.java
+++ b/processor/src/main/java/org/robolectric/annotation/processing/validator/ResetterValidator.java
diff --git a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/validator/Validator.java b/processor/src/main/java/org/robolectric/annotation/processing/validator/Validator.java
index 0741d8ee1..0741d8ee1 100644
--- a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/validator/Validator.java
+++ b/processor/src/main/java/org/robolectric/annotation/processing/validator/Validator.java
diff --git a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/validator/package-info.java b/processor/src/main/java/org/robolectric/annotation/processing/validator/package-info.java
index 654fa44c3..654fa44c3 100644
--- a/robolectric-processor/src/main/java/org/robolectric/annotation/processing/validator/package-info.java
+++ b/processor/src/main/java/org/robolectric/annotation/processing/validator/package-info.java
diff --git a/robolectric-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor
index 311b2d152..311b2d152 100644
--- a/robolectric-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor
+++ b/processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor
diff --git a/robolectric-processor/src/test/java/com/example/objects/AnyObject.java b/processor/src/test/java/com/example/objects/AnyObject.java
index c2816a113..c2816a113 100644
--- a/robolectric-processor/src/test/java/com/example/objects/AnyObject.java
+++ b/processor/src/test/java/com/example/objects/AnyObject.java
diff --git a/robolectric-processor/src/test/java/com/example/objects/DocumentedObject.java b/processor/src/test/java/com/example/objects/DocumentedObject.java
index 9d9f43917..9d9f43917 100644
--- a/robolectric-processor/src/test/java/com/example/objects/DocumentedObject.java
+++ b/processor/src/test/java/com/example/objects/DocumentedObject.java
diff --git a/robolectric-processor/src/test/java/com/example/objects/Dummy.java b/processor/src/test/java/com/example/objects/Dummy.java
index ad065f627..ad065f627 100644
--- a/robolectric-processor/src/test/java/com/example/objects/Dummy.java
+++ b/processor/src/test/java/com/example/objects/Dummy.java
diff --git a/robolectric-processor/src/test/java/com/example/objects/OuterDummy.java b/processor/src/test/java/com/example/objects/OuterDummy.java
index 467fe7f5e..467fe7f5e 100644
--- a/robolectric-processor/src/test/java/com/example/objects/OuterDummy.java
+++ b/processor/src/test/java/com/example/objects/OuterDummy.java
diff --git a/robolectric-processor/src/test/java/com/example/objects/OuterDummy2.java b/processor/src/test/java/com/example/objects/OuterDummy2.java
index b8c91676b..b8c91676b 100644
--- a/robolectric-processor/src/test/java/com/example/objects/OuterDummy2.java
+++ b/processor/src/test/java/com/example/objects/OuterDummy2.java
diff --git a/robolectric-processor/src/test/java/com/example/objects/ParameterizedDummy.java b/processor/src/test/java/com/example/objects/ParameterizedDummy.java
index bdf4c4641..bdf4c4641 100644
--- a/robolectric-processor/src/test/java/com/example/objects/ParameterizedDummy.java
+++ b/processor/src/test/java/com/example/objects/ParameterizedDummy.java
diff --git a/robolectric-processor/src/test/java/com/example/objects/Private.java b/processor/src/test/java/com/example/objects/Private.java
index cc0fff62f..cc0fff62f 100644
--- a/robolectric-processor/src/test/java/com/example/objects/Private.java
+++ b/processor/src/test/java/com/example/objects/Private.java
diff --git a/robolectric-processor/src/test/java/com/example/objects/UniqueDummy.java b/processor/src/test/java/com/example/objects/UniqueDummy.java
index 01804b72d..01804b72d 100644
--- a/robolectric-processor/src/test/java/com/example/objects/UniqueDummy.java
+++ b/processor/src/test/java/com/example/objects/UniqueDummy.java
diff --git a/robolectric-processor/src/test/java/com/example/objects2/Dummy.java b/processor/src/test/java/com/example/objects2/Dummy.java
index 416a67312..416a67312 100644
--- a/robolectric-processor/src/test/java/com/example/objects2/Dummy.java
+++ b/processor/src/test/java/com/example/objects2/Dummy.java
diff --git a/robolectric-processor/src/test/java/com/example/objects2/OuterDummy.java b/processor/src/test/java/com/example/objects2/OuterDummy.java
index b199756d2..b199756d2 100644
--- a/robolectric-processor/src/test/java/com/example/objects2/OuterDummy.java
+++ b/processor/src/test/java/com/example/objects2/OuterDummy.java
diff --git a/robolectric-processor/src/test/java/org/robolectric/annotation/UnrecognizedAnnotation.java b/processor/src/test/java/org/robolectric/annotation/UnrecognizedAnnotation.java
index 9f4029ece..9f4029ece 100644
--- a/robolectric-processor/src/test/java/org/robolectric/annotation/UnrecognizedAnnotation.java
+++ b/processor/src/test/java/org/robolectric/annotation/UnrecognizedAnnotation.java
diff --git a/robolectric-processor/src/test/java/org/robolectric/annotation/processing/RobolectricProcessorTest.java b/processor/src/test/java/org/robolectric/annotation/processing/RobolectricProcessorTest.java
index c074fe764..c074fe764 100644
--- a/robolectric-processor/src/test/java/org/robolectric/annotation/processing/RobolectricProcessorTest.java
+++ b/processor/src/test/java/org/robolectric/annotation/processing/RobolectricProcessorTest.java
diff --git a/robolectric-processor/src/test/java/org/robolectric/annotation/processing/generator/ShadowProviderGeneratorTest.java b/processor/src/test/java/org/robolectric/annotation/processing/generator/ShadowProviderGeneratorTest.java
index 56724f2ea..56724f2ea 100644
--- a/robolectric-processor/src/test/java/org/robolectric/annotation/processing/generator/ShadowProviderGeneratorTest.java
+++ b/processor/src/test/java/org/robolectric/annotation/processing/generator/ShadowProviderGeneratorTest.java
diff --git a/robolectric-processor/src/test/java/org/robolectric/annotation/processing/validator/ImplementationValidatorTest.java b/processor/src/test/java/org/robolectric/annotation/processing/validator/ImplementationValidatorTest.java
index 8c2ebc33c..8c2ebc33c 100644
--- a/robolectric-processor/src/test/java/org/robolectric/annotation/processing/validator/ImplementationValidatorTest.java
+++ b/processor/src/test/java/org/robolectric/annotation/processing/validator/ImplementationValidatorTest.java
diff --git a/robolectric-processor/src/test/java/org/robolectric/annotation/processing/validator/ImplementsValidatorTest.java b/processor/src/test/java/org/robolectric/annotation/processing/validator/ImplementsValidatorTest.java
index 94f849305..94f849305 100644
--- a/robolectric-processor/src/test/java/org/robolectric/annotation/processing/validator/ImplementsValidatorTest.java
+++ b/processor/src/test/java/org/robolectric/annotation/processing/validator/ImplementsValidatorTest.java
diff --git a/robolectric-processor/src/test/java/org/robolectric/annotation/processing/validator/RealObjectValidatorTest.java b/processor/src/test/java/org/robolectric/annotation/processing/validator/RealObjectValidatorTest.java
index e2c71b83f..e2c71b83f 100644
--- a/robolectric-processor/src/test/java/org/robolectric/annotation/processing/validator/RealObjectValidatorTest.java
+++ b/processor/src/test/java/org/robolectric/annotation/processing/validator/RealObjectValidatorTest.java
diff --git a/robolectric-processor/src/test/java/org/robolectric/annotation/processing/validator/ResetterValidatorTest.java b/processor/src/test/java/org/robolectric/annotation/processing/validator/ResetterValidatorTest.java
index 3c4d23a33..3c4d23a33 100644
--- a/robolectric-processor/src/test/java/org/robolectric/annotation/processing/validator/ResetterValidatorTest.java
+++ b/processor/src/test/java/org/robolectric/annotation/processing/validator/ResetterValidatorTest.java
diff --git a/robolectric-processor/src/test/java/org/robolectric/annotation/processing/validator/SingleClassSubject.java b/processor/src/test/java/org/robolectric/annotation/processing/validator/SingleClassSubject.java
index 013b0781b..013b0781b 100644
--- a/robolectric-processor/src/test/java/org/robolectric/annotation/processing/validator/SingleClassSubject.java
+++ b/processor/src/test/java/org/robolectric/annotation/processing/validator/SingleClassSubject.java
diff --git a/robolectric-processor/src/test/java/org/robolectric/annotation/processing/validator/Utils.java b/processor/src/test/java/org/robolectric/annotation/processing/validator/Utils.java
index 7ca040fc4..7ca040fc4 100644
--- a/robolectric-processor/src/test/java/org/robolectric/annotation/processing/validator/Utils.java
+++ b/processor/src/test/java/org/robolectric/annotation/processing/validator/Utils.java
diff --git a/robolectric-processor/src/test/resources/META-INF/services/org.robolectric.internal.ShadowProvider b/processor/src/test/resources/META-INF/services/org.robolectric.internal.ShadowProvider
index e46dc6a76..e46dc6a76 100644
--- a/robolectric-processor/src/test/resources/META-INF/services/org.robolectric.internal.ShadowProvider
+++ b/processor/src/test/resources/META-INF/services/org.robolectric.internal.ShadowProvider
diff --git a/robolectric-processor/src/test/resources/mock-source/Robolectric.java b/processor/src/test/resources/mock-source/Robolectric.java
index 9373e1630..9373e1630 100644
--- a/robolectric-processor/src/test/resources/mock-source/Robolectric.java
+++ b/processor/src/test/resources/mock-source/Robolectric.java
diff --git a/robolectric-processor/src/test/resources/mock-source/org/robolectric/internal/ShadowExtractor.java b/processor/src/test/resources/mock-source/org/robolectric/internal/ShadowExtractor.java
index ff84a5994..ff84a5994 100644
--- a/robolectric-processor/src/test/resources/mock-source/org/robolectric/internal/ShadowExtractor.java
+++ b/processor/src/test/resources/mock-source/org/robolectric/internal/ShadowExtractor.java
diff --git a/robolectric-processor/src/test/resources/mock-source/org/robolectric/internal/ShadowProvider.java b/processor/src/test/resources/mock-source/org/robolectric/internal/ShadowProvider.java
index 9bcde3467..9bcde3467 100644
--- a/robolectric-processor/src/test/resources/mock-source/org/robolectric/internal/ShadowProvider.java
+++ b/processor/src/test/resources/mock-source/org/robolectric/internal/ShadowProvider.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/Robolectric_Anything.java b/processor/src/test/resources/org/robolectric/Robolectric_Anything.java
index 0604fa8b8..0604fa8b8 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/Robolectric_Anything.java
+++ b/processor/src/test/resources/org/robolectric/Robolectric_Anything.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/Robolectric_ClassNameOnly.java b/processor/src/test/resources/org/robolectric/Robolectric_ClassNameOnly.java
index 2fb9f479e..2fb9f479e 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/Robolectric_ClassNameOnly.java
+++ b/processor/src/test/resources/org/robolectric/Robolectric_ClassNameOnly.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/Robolectric_EmptyProvidedPackageNames.java b/processor/src/test/resources/org/robolectric/Robolectric_EmptyProvidedPackageNames.java
index a7e33dddd..a7e33dddd 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/Robolectric_EmptyProvidedPackageNames.java
+++ b/processor/src/test/resources/org/robolectric/Robolectric_EmptyProvidedPackageNames.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/Robolectric_HiddenClasses.java b/processor/src/test/resources/org/robolectric/Robolectric_HiddenClasses.java
index 219fd1d4e..219fd1d4e 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/Robolectric_HiddenClasses.java
+++ b/processor/src/test/resources/org/robolectric/Robolectric_HiddenClasses.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/Robolectric_InnerClassCollision.java b/processor/src/test/resources/org/robolectric/Robolectric_InnerClassCollision.java
index 296867771..296867771 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/Robolectric_InnerClassCollision.java
+++ b/processor/src/test/resources/org/robolectric/Robolectric_InnerClassCollision.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/Robolectric_NoExcludedTypes.java b/processor/src/test/resources/org/robolectric/Robolectric_NoExcludedTypes.java
index c9a869fbe..c9a869fbe 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/Robolectric_NoExcludedTypes.java
+++ b/processor/src/test/resources/org/robolectric/Robolectric_NoExcludedTypes.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/Robolectric_Parameterized.java b/processor/src/test/resources/org/robolectric/Robolectric_Parameterized.java
index d287157af..d287157af 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/Robolectric_Parameterized.java
+++ b/processor/src/test/resources/org/robolectric/Robolectric_Parameterized.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/TestWithUnrecognizedAnnotation.java b/processor/src/test/resources/org/robolectric/annotation/TestWithUnrecognizedAnnotation.java
index aaf35d1ab..aaf35d1ab 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/TestWithUnrecognizedAnnotation.java
+++ b/processor/src/test/resources/org/robolectric/annotation/TestWithUnrecognizedAnnotation.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/DocumentedObjectShadow.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/DocumentedObjectShadow.java
index 93d802ab5..93d802ab5 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/DocumentedObjectShadow.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/DocumentedObjectShadow.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowAnything.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowAnything.java
index 82c4167a3..82c4167a3 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowAnything.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowAnything.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowClassNameOnly.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowClassNameOnly.java
index f3a9a661c..f3a9a661c 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowClassNameOnly.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowClassNameOnly.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowDummy.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowDummy.java
index d3ed8be61..d3ed8be61 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowDummy.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowDummy.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowExcludedFromAndroidSdk.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowExcludedFromAndroidSdk.java
index 21411479a..21411479a 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowExcludedFromAndroidSdk.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowExcludedFromAndroidSdk.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementationWithoutImplements.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementationWithoutImplements.java
index 52e1a33f8..52e1a33f8 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementationWithoutImplements.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementationWithoutImplements.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsAnythingWithUnresolvableClassName.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsAnythingWithUnresolvableClassName.java
index d3db66f44..d3db66f44 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsAnythingWithUnresolvableClassName.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsAnythingWithUnresolvableClassName.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsAnythingWithUnresolvableClassNameAndOldMaxSdk.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsAnythingWithUnresolvableClassNameAndOldMaxSdk.java
index 713e6166a..713e6166a 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsAnythingWithUnresolvableClassNameAndOldMaxSdk.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsAnythingWithUnresolvableClassNameAndOldMaxSdk.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsAnythingWithoutClassName.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsAnythingWithoutClassName.java
index 585531138..585531138 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsAnythingWithoutClassName.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsAnythingWithoutClassName.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsDummyWithOuterDummyClassName.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsDummyWithOuterDummyClassName.java
index 1f42b2f8c..1f42b2f8c 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsDummyWithOuterDummyClassName.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsDummyWithOuterDummyClassName.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsWithExtraParameters.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsWithExtraParameters.java
index a7d7f6712..a7d7f6712 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsWithExtraParameters.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsWithExtraParameters.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsWithMissingParameters.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsWithMissingParameters.java
index 694399fa4..694399fa4 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsWithMissingParameters.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsWithMissingParameters.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsWithParameterMismatch.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsWithParameterMismatch.java
index 3e8396b61..3e8396b61 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsWithParameterMismatch.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsWithParameterMismatch.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsWithoutClass.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsWithoutClass.java
index 6a1865fdd..6a1865fdd 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsWithoutClass.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowImplementsWithoutClass.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowOuterDummy.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowOuterDummy.java
index 6fb8e59bb..6fb8e59bb 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowOuterDummy.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowOuterDummy.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowOuterDummy2.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowOuterDummy2.java
index 6aa4078dc..6aa4078dc 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowOuterDummy2.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowOuterDummy2.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowParameterizedDummy.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowParameterizedDummy.java
index 28a21427a..28a21427a 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowParameterizedDummy.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowParameterizedDummy.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowPrivate.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowPrivate.java
index db9ce521d..db9ce521d 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowPrivate.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowPrivate.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectParameterizedMismatch.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectParameterizedMismatch.java
index ed46753a9..ed46753a9 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectParameterizedMismatch.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectParameterizedMismatch.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectParameterizedMissingParameters.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectParameterizedMissingParameters.java
index 2e7b8c24b..2e7b8c24b 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectParameterizedMissingParameters.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectParameterizedMissingParameters.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithCorrectAnything.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithCorrectAnything.java
index 6a6c773bd..6a6c773bd 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithCorrectAnything.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithCorrectAnything.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithCorrectClassName.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithCorrectClassName.java
index 3a6b4d7d6..3a6b4d7d6 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithCorrectClassName.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithCorrectClassName.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithCorrectType.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithCorrectType.java
index bc9b6e9de..bc9b6e9de 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithCorrectType.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithCorrectType.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithEmptyClassNameNoAnything.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithEmptyClassNameNoAnything.java
index 7de58fbd9..7de58fbd9 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithEmptyClassNameNoAnything.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithEmptyClassNameNoAnything.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithEmptyImplements.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithEmptyImplements.java
index 99b825950..99b825950 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithEmptyImplements.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithEmptyImplements.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithIncorrectClassName.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithIncorrectClassName.java
index 4fb6cb890..4fb6cb890 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithIncorrectClassName.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithIncorrectClassName.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithMissingClassName.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithMissingClassName.java
index c241a4134..c241a4134 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithMissingClassName.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithMissingClassName.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithNestedClassName.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithNestedClassName.java
index 4d8953f10..4d8953f10 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithNestedClassName.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithNestedClassName.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithWrongType.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithWrongType.java
index 1590f7fbd..1590f7fbd 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithWrongType.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithWrongType.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithoutImplements.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithoutImplements.java
index 41824f86d..41824f86d 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithoutImplements.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowRealObjectWithoutImplements.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowResetterNonPublic.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowResetterNonPublic.java
index 7a2048a29..7a2048a29 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowResetterNonPublic.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowResetterNonPublic.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowResetterNonStatic.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowResetterNonStatic.java
index dd9a809a8..dd9a809a8 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowResetterNonStatic.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowResetterNonStatic.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowResetterWithParameters.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowResetterWithParameters.java
index 1af4dff03..1af4dff03 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowResetterWithParameters.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowResetterWithParameters.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowResetterWithoutImplements.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowResetterWithoutImplements.java
index df14d9003..df14d9003 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowResetterWithoutImplements.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowResetterWithoutImplements.java
diff --git a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowUniqueDummy.java b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowUniqueDummy.java
index ca630a7e6..ca630a7e6 100644
--- a/robolectric-processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowUniqueDummy.java
+++ b/processor/src/test/resources/org/robolectric/annotation/processing/shadows/ShadowUniqueDummy.java
diff --git a/robolectric-resources/build.gradle b/resources/build.gradle
index 93c255d4e..77d7c0220 100644
--- a/robolectric-resources/build.gradle
+++ b/resources/build.gradle
@@ -8,8 +8,8 @@ new RoboJavaModulePlugin(
 
 dependencies {
     // Project dependencies
-    compile project(":robolectric-utils")
-    compile project(":robolectric-annotations")
+    compile project(":utils")
+    compile project(":annotations")
 
     // Compile dependencies
     compile "com.google.guava:guava:20.0"
diff --git a/robolectric-resources/src/main/java/org/robolectric/RoboSettings.java b/resources/src/main/java/org/robolectric/RoboSettings.java
index 3ca247618..3ca247618 100644
--- a/robolectric-resources/src/main/java/org/robolectric/RoboSettings.java
+++ b/resources/src/main/java/org/robolectric/RoboSettings.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/manifest/ActivityData.java b/resources/src/main/java/org/robolectric/manifest/ActivityData.java
index 7088115b1..7088115b1 100644
--- a/robolectric-resources/src/main/java/org/robolectric/manifest/ActivityData.java
+++ b/resources/src/main/java/org/robolectric/manifest/ActivityData.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/manifest/AndroidManifest.java b/resources/src/main/java/org/robolectric/manifest/AndroidManifest.java
index 6e9075393..6e9075393 100644
--- a/robolectric-resources/src/main/java/org/robolectric/manifest/AndroidManifest.java
+++ b/resources/src/main/java/org/robolectric/manifest/AndroidManifest.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/manifest/BroadcastReceiverData.java b/resources/src/main/java/org/robolectric/manifest/BroadcastReceiverData.java
index 9d549de4b..9d549de4b 100644
--- a/robolectric-resources/src/main/java/org/robolectric/manifest/BroadcastReceiverData.java
+++ b/resources/src/main/java/org/robolectric/manifest/BroadcastReceiverData.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/manifest/ContentProviderData.java b/resources/src/main/java/org/robolectric/manifest/ContentProviderData.java
index 5faf33ed0..5faf33ed0 100644
--- a/robolectric-resources/src/main/java/org/robolectric/manifest/ContentProviderData.java
+++ b/resources/src/main/java/org/robolectric/manifest/ContentProviderData.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/manifest/IntentFilterData.java b/resources/src/main/java/org/robolectric/manifest/IntentFilterData.java
index d18b44329..d18b44329 100644
--- a/robolectric-resources/src/main/java/org/robolectric/manifest/IntentFilterData.java
+++ b/resources/src/main/java/org/robolectric/manifest/IntentFilterData.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/manifest/MetaData.java b/resources/src/main/java/org/robolectric/manifest/MetaData.java
index 6dc6cc0c6..6dc6cc0c6 100644
--- a/robolectric-resources/src/main/java/org/robolectric/manifest/MetaData.java
+++ b/resources/src/main/java/org/robolectric/manifest/MetaData.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/manifest/PackageItemData.java b/resources/src/main/java/org/robolectric/manifest/PackageItemData.java
index 5bea26406..5bea26406 100644
--- a/robolectric-resources/src/main/java/org/robolectric/manifest/PackageItemData.java
+++ b/resources/src/main/java/org/robolectric/manifest/PackageItemData.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/manifest/PathPermissionData.java b/resources/src/main/java/org/robolectric/manifest/PathPermissionData.java
index 48820dbef..48820dbef 100644
--- a/robolectric-resources/src/main/java/org/robolectric/manifest/PathPermissionData.java
+++ b/resources/src/main/java/org/robolectric/manifest/PathPermissionData.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/manifest/PermissionItemData.java b/resources/src/main/java/org/robolectric/manifest/PermissionItemData.java
index cadc7ca21..cadc7ca21 100644
--- a/robolectric-resources/src/main/java/org/robolectric/manifest/PermissionItemData.java
+++ b/resources/src/main/java/org/robolectric/manifest/PermissionItemData.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/manifest/RoboNotFoundException.java b/resources/src/main/java/org/robolectric/manifest/RoboNotFoundException.java
index ba05c264d..ba05c264d 100644
--- a/robolectric-resources/src/main/java/org/robolectric/manifest/RoboNotFoundException.java
+++ b/resources/src/main/java/org/robolectric/manifest/RoboNotFoundException.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/manifest/ServiceData.java b/resources/src/main/java/org/robolectric/manifest/ServiceData.java
index cde5bcc59..cde5bcc59 100644
--- a/robolectric-resources/src/main/java/org/robolectric/manifest/ServiceData.java
+++ b/resources/src/main/java/org/robolectric/manifest/ServiceData.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/AttrData.java b/resources/src/main/java/org/robolectric/res/AttrData.java
index f6b59a279..f6b59a279 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/AttrData.java
+++ b/resources/src/main/java/org/robolectric/res/AttrData.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/AttributeResource.java b/resources/src/main/java/org/robolectric/res/AttributeResource.java
index 03fe20a2b..03fe20a2b 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/AttributeResource.java
+++ b/resources/src/main/java/org/robolectric/res/AttributeResource.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/DocumentLoader.java b/resources/src/main/java/org/robolectric/res/DocumentLoader.java
index cd24e8be9..cd24e8be9 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/DocumentLoader.java
+++ b/resources/src/main/java/org/robolectric/res/DocumentLoader.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/DrawableResourceLoader.java b/resources/src/main/java/org/robolectric/res/DrawableResourceLoader.java
index f4ac53e0a..f4ac53e0a 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/DrawableResourceLoader.java
+++ b/resources/src/main/java/org/robolectric/res/DrawableResourceLoader.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/EmptyStyle.java b/resources/src/main/java/org/robolectric/res/EmptyStyle.java
index f75317e81..f75317e81 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/EmptyStyle.java
+++ b/resources/src/main/java/org/robolectric/res/EmptyStyle.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/FileFsFile.java b/resources/src/main/java/org/robolectric/res/FileFsFile.java
index 8fbacd6b5..8fbacd6b5 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/FileFsFile.java
+++ b/resources/src/main/java/org/robolectric/res/FileFsFile.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/FileTypedResource.java b/resources/src/main/java/org/robolectric/res/FileTypedResource.java
index f4cdcfec0..f4cdcfec0 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/FileTypedResource.java
+++ b/resources/src/main/java/org/robolectric/res/FileTypedResource.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/Fs.java b/resources/src/main/java/org/robolectric/res/Fs.java
index b0db3642b..b0db3642b 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/Fs.java
+++ b/resources/src/main/java/org/robolectric/res/Fs.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/FsFile.java b/resources/src/main/java/org/robolectric/res/FsFile.java
index 618571b63..618571b63 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/FsFile.java
+++ b/resources/src/main/java/org/robolectric/res/FsFile.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/NodeHandler.java b/resources/src/main/java/org/robolectric/res/NodeHandler.java
index 649d092c8..649d092c8 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/NodeHandler.java
+++ b/resources/src/main/java/org/robolectric/res/NodeHandler.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/PackageResourceTable.java b/resources/src/main/java/org/robolectric/res/PackageResourceTable.java
index 39eb2e065..39eb2e065 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/PackageResourceTable.java
+++ b/resources/src/main/java/org/robolectric/res/PackageResourceTable.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/Plural.java b/resources/src/main/java/org/robolectric/res/Plural.java
index 5254abe46..5254abe46 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/Plural.java
+++ b/resources/src/main/java/org/robolectric/res/Plural.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/PluralRules.java b/resources/src/main/java/org/robolectric/res/PluralRules.java
index 123c49b92..123c49b92 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/PluralRules.java
+++ b/resources/src/main/java/org/robolectric/res/PluralRules.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/Qualifiers.java b/resources/src/main/java/org/robolectric/res/Qualifiers.java
index d57355c75..d57355c75 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/Qualifiers.java
+++ b/resources/src/main/java/org/robolectric/res/Qualifiers.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/RawResourceLoader.java b/resources/src/main/java/org/robolectric/res/RawResourceLoader.java
index 2da8896fb..2da8896fb 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/RawResourceLoader.java
+++ b/resources/src/main/java/org/robolectric/res/RawResourceLoader.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/ResBunch.java b/resources/src/main/java/org/robolectric/res/ResBunch.java
index 5dd68fbd0..5dd68fbd0 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/ResBunch.java
+++ b/resources/src/main/java/org/robolectric/res/ResBunch.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/ResBundle.java b/resources/src/main/java/org/robolectric/res/ResBundle.java
index 8c668ab76..8c668ab76 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/ResBundle.java
+++ b/resources/src/main/java/org/robolectric/res/ResBundle.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/ResName.java b/resources/src/main/java/org/robolectric/res/ResName.java
index 102043ef4..102043ef4 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/ResName.java
+++ b/resources/src/main/java/org/robolectric/res/ResName.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/ResType.java b/resources/src/main/java/org/robolectric/res/ResType.java
index 97eb4cef2..97eb4cef2 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/ResType.java
+++ b/resources/src/main/java/org/robolectric/res/ResType.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/ResourceIdGenerator.java b/resources/src/main/java/org/robolectric/res/ResourceIdGenerator.java
index 054a355e6..054a355e6 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/ResourceIdGenerator.java
+++ b/resources/src/main/java/org/robolectric/res/ResourceIdGenerator.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/ResourceIds.java b/resources/src/main/java/org/robolectric/res/ResourceIds.java
index a4dbdb735..a4dbdb735 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/ResourceIds.java
+++ b/resources/src/main/java/org/robolectric/res/ResourceIds.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/ResourceMerger.java b/resources/src/main/java/org/robolectric/res/ResourceMerger.java
index ab1467926..ab1467926 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/ResourceMerger.java
+++ b/resources/src/main/java/org/robolectric/res/ResourceMerger.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/ResourcePath.java b/resources/src/main/java/org/robolectric/res/ResourcePath.java
index 5e800d68d..5e800d68d 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/ResourcePath.java
+++ b/resources/src/main/java/org/robolectric/res/ResourcePath.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/ResourceRemapper.java b/resources/src/main/java/org/robolectric/res/ResourceRemapper.java
index 26650819f..26650819f 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/ResourceRemapper.java
+++ b/resources/src/main/java/org/robolectric/res/ResourceRemapper.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/ResourceTable.java b/resources/src/main/java/org/robolectric/res/ResourceTable.java
index 62d7e3fd0..62d7e3fd0 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/ResourceTable.java
+++ b/resources/src/main/java/org/robolectric/res/ResourceTable.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/ResourceTableFactory.java b/resources/src/main/java/org/robolectric/res/ResourceTableFactory.java
index 3c87ea899..3c87ea899 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/ResourceTableFactory.java
+++ b/resources/src/main/java/org/robolectric/res/ResourceTableFactory.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/ResourceValueConverter.java b/resources/src/main/java/org/robolectric/res/ResourceValueConverter.java
index b6f72b1e0..b6f72b1e0 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/ResourceValueConverter.java
+++ b/resources/src/main/java/org/robolectric/res/ResourceValueConverter.java
diff --git a/resources/src/main/java/org/robolectric/res/RoutingResourceLoader.java b/resources/src/main/java/org/robolectric/res/RoutingResourceLoader.java
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/resources/src/main/java/org/robolectric/res/RoutingResourceLoader.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/RoutingResourceTable.java b/resources/src/main/java/org/robolectric/res/RoutingResourceTable.java
index 79dffc908..79dffc908 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/RoutingResourceTable.java
+++ b/resources/src/main/java/org/robolectric/res/RoutingResourceTable.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/StartsWithFilter.java b/resources/src/main/java/org/robolectric/res/StartsWithFilter.java
index 8309126c0..8309126c0 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/StartsWithFilter.java
+++ b/resources/src/main/java/org/robolectric/res/StartsWithFilter.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/StaxArrayLoader.java b/resources/src/main/java/org/robolectric/res/StaxArrayLoader.java
index 20c5df4b1..20c5df4b1 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/StaxArrayLoader.java
+++ b/resources/src/main/java/org/robolectric/res/StaxArrayLoader.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/StaxAttrLoader.java b/resources/src/main/java/org/robolectric/res/StaxAttrLoader.java
index 965c8429e..965c8429e 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/StaxAttrLoader.java
+++ b/resources/src/main/java/org/robolectric/res/StaxAttrLoader.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/StaxDocumentLoader.java b/resources/src/main/java/org/robolectric/res/StaxDocumentLoader.java
index 689c2b427..689c2b427 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/StaxDocumentLoader.java
+++ b/resources/src/main/java/org/robolectric/res/StaxDocumentLoader.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/StaxLoader.java b/resources/src/main/java/org/robolectric/res/StaxLoader.java
index 3c19ab40c..3c19ab40c 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/StaxLoader.java
+++ b/resources/src/main/java/org/robolectric/res/StaxLoader.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/StaxPluralsLoader.java b/resources/src/main/java/org/robolectric/res/StaxPluralsLoader.java
index 9f5532dad..9f5532dad 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/StaxPluralsLoader.java
+++ b/resources/src/main/java/org/robolectric/res/StaxPluralsLoader.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/StaxStyleLoader.java b/resources/src/main/java/org/robolectric/res/StaxStyleLoader.java
index 949568868..949568868 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/StaxStyleLoader.java
+++ b/resources/src/main/java/org/robolectric/res/StaxStyleLoader.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/StaxValueLoader.java b/resources/src/main/java/org/robolectric/res/StaxValueLoader.java
index 0aa25c4e2..0aa25c4e2 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/StaxValueLoader.java
+++ b/resources/src/main/java/org/robolectric/res/StaxValueLoader.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/StringResources.java b/resources/src/main/java/org/robolectric/res/StringResources.java
index 84db63c0a..84db63c0a 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/StringResources.java
+++ b/resources/src/main/java/org/robolectric/res/StringResources.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/Style.java b/resources/src/main/java/org/robolectric/res/Style.java
index 8bca7d6d5..8bca7d6d5 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/Style.java
+++ b/resources/src/main/java/org/robolectric/res/Style.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/StyleData.java b/resources/src/main/java/org/robolectric/res/StyleData.java
index 03f35aba4..03f35aba4 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/StyleData.java
+++ b/resources/src/main/java/org/robolectric/res/StyleData.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/StyleResolver.java b/resources/src/main/java/org/robolectric/res/StyleResolver.java
index ec965b676..ec965b676 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/StyleResolver.java
+++ b/resources/src/main/java/org/robolectric/res/StyleResolver.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/TextCollectingNodeHandler.java b/resources/src/main/java/org/robolectric/res/TextCollectingNodeHandler.java
index 2e2cca117..2e2cca117 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/TextCollectingNodeHandler.java
+++ b/resources/src/main/java/org/robolectric/res/TextCollectingNodeHandler.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/ThemeStyleSet.java b/resources/src/main/java/org/robolectric/res/ThemeStyleSet.java
index 9c893e5ef..9c893e5ef 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/ThemeStyleSet.java
+++ b/resources/src/main/java/org/robolectric/res/ThemeStyleSet.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/TypedResource.java b/resources/src/main/java/org/robolectric/res/TypedResource.java
index a508275ac..a508275ac 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/TypedResource.java
+++ b/resources/src/main/java/org/robolectric/res/TypedResource.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/XmlContext.java b/resources/src/main/java/org/robolectric/res/XmlContext.java
index b5c6eca00..b5c6eca00 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/XmlContext.java
+++ b/resources/src/main/java/org/robolectric/res/XmlContext.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/builder/XmlBlock.java b/resources/src/main/java/org/robolectric/res/builder/XmlBlock.java
index d200f0be2..d200f0be2 100644
--- a/robolectric-resources/src/main/java/org/robolectric/res/builder/XmlBlock.java
+++ b/resources/src/main/java/org/robolectric/res/builder/XmlBlock.java
diff --git a/robolectric-resources/src/test/java/org/robolectric/RoboSettingsTest.java b/resources/src/test/java/org/robolectric/RoboSettingsTest.java
index fccf8e9e2..fccf8e9e2 100644
--- a/robolectric-resources/src/test/java/org/robolectric/RoboSettingsTest.java
+++ b/resources/src/test/java/org/robolectric/RoboSettingsTest.java
diff --git a/robolectric-resources/src/test/java/org/robolectric/manifest/ActivityDataTest.java b/resources/src/test/java/org/robolectric/manifest/ActivityDataTest.java
index bafd4b280..bafd4b280 100644
--- a/robolectric-resources/src/test/java/org/robolectric/manifest/ActivityDataTest.java
+++ b/resources/src/test/java/org/robolectric/manifest/ActivityDataTest.java
diff --git a/robolectric-resources/src/test/java/org/robolectric/manifest/MetaDataTest.java b/resources/src/test/java/org/robolectric/manifest/MetaDataTest.java
index c41c31c7e..c41c31c7e 100644
--- a/robolectric-resources/src/test/java/org/robolectric/manifest/MetaDataTest.java
+++ b/resources/src/test/java/org/robolectric/manifest/MetaDataTest.java
diff --git a/robolectric-resources/src/test/java/org/robolectric/res/QualifiersTest.java b/resources/src/test/java/org/robolectric/res/QualifiersTest.java
index d68356835..d68356835 100644
--- a/robolectric-resources/src/test/java/org/robolectric/res/QualifiersTest.java
+++ b/resources/src/test/java/org/robolectric/res/QualifiersTest.java
diff --git a/robolectric-resources/src/test/java/org/robolectric/res/ResTypeTest.java b/resources/src/test/java/org/robolectric/res/ResTypeTest.java
index 2217f4780..2217f4780 100644
--- a/robolectric-resources/src/test/java/org/robolectric/res/ResTypeTest.java
+++ b/resources/src/test/java/org/robolectric/res/ResTypeTest.java
diff --git a/robolectric-resources/src/test/java/org/robolectric/res/ResourceIdsTest.java b/resources/src/test/java/org/robolectric/res/ResourceIdsTest.java
index 3ab3de14a..3ab3de14a 100644
--- a/robolectric-resources/src/test/java/org/robolectric/res/ResourceIdsTest.java
+++ b/resources/src/test/java/org/robolectric/res/ResourceIdsTest.java
diff --git a/robolectric-resources/src/test/java/org/robolectric/res/StaxValueLoaderTest.java b/resources/src/test/java/org/robolectric/res/StaxValueLoaderTest.java
index 07163a330..07163a330 100644
--- a/robolectric-resources/src/test/java/org/robolectric/res/StaxValueLoaderTest.java
+++ b/resources/src/test/java/org/robolectric/res/StaxValueLoaderTest.java
diff --git a/robolectric-resources/src/test/java/org/robolectric/res/StyleDataTest.java b/resources/src/test/java/org/robolectric/res/StyleDataTest.java
index 06e19ff9a..06e19ff9a 100644
--- a/robolectric-resources/src/test/java/org/robolectric/res/StyleDataTest.java
+++ b/resources/src/test/java/org/robolectric/res/StyleDataTest.java
diff --git a/robolectric-resources/src/test/java/org/robolectric/res/ThemeStyleSetTest.java b/resources/src/test/java/org/robolectric/res/ThemeStyleSetTest.java
index d11558cb2..d11558cb2 100644
--- a/robolectric-resources/src/test/java/org/robolectric/res/ThemeStyleSetTest.java
+++ b/resources/src/test/java/org/robolectric/res/ThemeStyleSetTest.java
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/PackageResourceTable.java.rej b/robolectric-resources/src/main/java/org/robolectric/res/PackageResourceTable.java.rej
deleted file mode 100644
index 7749277ad..000000000
--- a/robolectric-resources/src/main/java/org/robolectric/res/PackageResourceTable.java.rej
+++ /dev/null
@@ -1,16 +0,0 @@
---- org/robolectric/res/PackageResourceTable.java
-+++ org/robolectric/res/PackageResourceTable.java
-@@ -55,5 +55,5 @@
-   }
- 
--  public XmlBlock getXml(ResName resName, String qualifiers) {
-+  @Override public XmlBlock getXml(ResName resName, String qualifiers) {
-     FileTypedResource fileTypedResource = getFileResource(resName, qualifiers);
-     if (fileTypedResource == null || !fileTypedResource.isXml()) {
-@@ -64,5 +64,5 @@
-   }
- 
--  public InputStream getRawValue(ResName resName, String qualifiers) {
-+  @Override public InputStream getRawValue(ResName resName, String qualifiers) {
-     FileTypedResource fileTypedResource = getFileResource(resName, qualifiers);
-     if (fileTypedResource == null) {
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/RoutingResourceTable.java.rej b/robolectric-resources/src/main/java/org/robolectric/res/RoutingResourceTable.java.rej
deleted file mode 100644
index 6cb79593c..000000000
--- a/robolectric-resources/src/main/java/org/robolectric/res/RoutingResourceTable.java.rej
+++ /dev/null
@@ -1,27 +0,0 @@
---- org/robolectric/res/RoutingResourceTable.java
-+++ org/robolectric/res/RoutingResourceTable.java
-@@ -21,5 +21,5 @@
-   }
- 
--  public InputStream getRawValue(int resId, String qualifiers) {
-+  @Override public InputStream getRawValue(int resId, String qualifiers) {
-     ResName resName = getResName(resId);
-     return resName != null ? getRawValue(resName, qualifiers) : null;
-@@ -30,14 +30,14 @@
-   }
- 
--  public TypedResource getValue(int resId, String qualifiers) {
-+  @Override public TypedResource getValue(int resId, String qualifiers) {
-     ResName resName = pickFor(resId).getResName(resId);
-     return resName != null ? getValue(resName, qualifiers) : null;
-   }
- 
--  public XmlBlock getXml(ResName resName, String qualifiers) {
-+  @Override public XmlBlock getXml(ResName resName, String qualifiers) {
-     return pickFor(resName).getXml(resName, qualifiers);
-   }
- 
--  public InputStream getRawValue(ResName resName, String qualifiers) {
-+  @Override public InputStream getRawValue(ResName resName, String qualifiers) {
-     return pickFor(resName).getRawValue(resName, qualifiers);
-   }
diff --git a/robolectric-resources/src/main/java/org/robolectric/res/ThemeStyleSet.java.rej b/robolectric-resources/src/main/java/org/robolectric/res/ThemeStyleSet.java.rej
deleted file mode 100644
index ea4faf7ab..000000000
--- a/robolectric-resources/src/main/java/org/robolectric/res/ThemeStyleSet.java.rej
+++ /dev/null
@@ -1,9 +0,0 @@
---- org/robolectric/res/ThemeStyleSet.java
-+++ org/robolectric/res/ThemeStyleSet.java
-@@ -11,5 +11,5 @@
-   private List<OverlayedStyle> styles = new ArrayList<>();
- 
--  public AttributeResource getAttrValue(ResName attrName) {
-+  @Override public AttributeResource getAttrValue(ResName attrName) {
-     AttributeResource attribute = null;
- 
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowImpl.java.rej b/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowImpl.java.rej
deleted file mode 100644
index e8776c9a1..000000000
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowImpl.java.rej
+++ /dev/null
@@ -1,54 +0,0 @@
---- org/robolectric/internal/bytecode/ShadowImpl.java
-+++ org/robolectric/internal/bytecode/ShadowImpl.java
-@@ -18,13 +18,13 @@
-   }
- 
--  public <T> T newInstanceOf(Class<T> clazz) {
-+  @Override public <T> T newInstanceOf(Class<T> clazz) {
-     return ReflectionHelpers.callConstructor(clazz);
-   }
- 
--  public <T> T newInstance(Class<T> clazz, Class[] parameterTypes, Object[] params) {
-+  @Override public <T> T newInstance(Class<T> clazz, Class[] parameterTypes, Object[] params) {
-     return ReflectionHelpers.callConstructor(clazz, ReflectionHelpers.ClassParameter.fromComponentLists(parameterTypes, params));
-   }
- 
--  public <T> T directlyOn(T shadowedObject, Class<T> clazz) {
-+  @Override public <T> T directlyOn(T shadowedObject, Class<T> clazz) {
-     return createProxy(shadowedObject, clazz);
-   }
-@@ -44,5 +44,5 @@
-   }
- 
--  @SuppressWarnings(value = {"unchecked", "TypeParameterUnusedInFormals"})
-+  @Override @SuppressWarnings(value = {"unchecked", "TypeParameterUnusedInFormals"})
-   public <R> R directlyOn(Object shadowedObject, String clazzName, String methodName, ReflectionHelpers.ClassParameter... paramValues) {
-     try {
-@@ -54,5 +54,5 @@
-   }
- 
--  @SuppressWarnings(value = {"unchecked", "TypeParameterUnusedInFormals"})
-+  @Override @SuppressWarnings(value = {"unchecked", "TypeParameterUnusedInFormals"})
-   public <R, T> R directlyOn(T shadowedObject, Class<T> clazz, String methodName, ReflectionHelpers.ClassParameter... paramValues) {
-     String directMethodName = directMethodName(methodName);
-@@ -60,5 +60,5 @@
-   }
- 
--  @SuppressWarnings(value = {"unchecked", "TypeParameterUnusedInFormals"})
-+  @Override @SuppressWarnings(value = {"unchecked", "TypeParameterUnusedInFormals"})
-   public <R, T> R directlyOn(Class<T> clazz, String methodName, ReflectionHelpers.ClassParameter... paramValues) {
-     String directMethodName = directMethodName(methodName);
-@@ -66,5 +66,5 @@
-   }
- 
--  @SuppressWarnings(value = {"unchecked", "TypeParameterUnusedInFormals"})
-+  @Override @SuppressWarnings(value = {"unchecked", "TypeParameterUnusedInFormals"})
-   public <R> R invokeConstructor(Class<? extends R> clazz, R instance, ReflectionHelpers.ClassParameter... paramValues) {
-     String directMethodName = directMethodName(ShadowConstants.CONSTRUCTOR_METHOD_NAME);
-@@ -72,5 +72,5 @@
-   }
- 
--  public String directMethodName(String methodName) {
-+  @Override public String directMethodName(String methodName) {
-     return ShadowConstants.ROBO_PREFIX + methodName;
- 
diff --git a/robolectric/build.gradle b/robolectric/build.gradle
index 49e43fdb4..4e92649db 100644
--- a/robolectric/build.gradle
+++ b/robolectric/build.gradle
@@ -22,15 +22,15 @@ project.sourceSets.test.compileClasspath += configurations.shadow
 
 dependencies {
     // Project dependencies
-    compile project(":robolectric-annotations")
-    compile project(":robolectric-junit")
-    compile project(":robolectric-resources")
-    compile project(":robolectric-sandbox")
-    compile project(":robolectric-utils")
+    compile project(":annotations")
+    compile project(":junit")
+    compile project(":resources")
+    compile project(":sandbox")
+    compile project(":utils")
 
     // We need to have shadows-core.jar on the runtime system classpath so ServiceLoader
     //   can find its META-INF/services/org.robolectric.shadows.ShadowAdapter.
-    compile project(":robolectric-shadows/shadows-core")
+    compile project(":shadows/framework")
 
     // Compile dependencies
     compile "org.bouncycastle:bcprov-jdk16:1.46"
@@ -57,24 +57,24 @@ project.apply plugin: CheckApiChangesPlugin
 checkApiChanges {
     from = [
             "org.robolectric:robolectric:${apiCompatVersion}@jar",
-            "org.robolectric:robolectric-annotations:${apiCompatVersion}@jar",
-            "org.robolectric:robolectric-junit:${apiCompatVersion}@jar",
-            "org.robolectric:robolectric-resources:${apiCompatVersion}@jar",
-            "org.robolectric:robolectric-sandbox:${apiCompatVersion}@jar",
-            "org.robolectric:robolectric-utils:${apiCompatVersion}@jar",
-            "org.robolectric:shadow-api:${apiCompatVersion}@jar",
+            "org.robolectric:annotations:${apiCompatVersion}@jar",
+            "org.robolectric:junit:${apiCompatVersion}@jar",
+            "org.robolectric:resources:${apiCompatVersion}@jar",
+            "org.robolectric:sandbox:${apiCompatVersion}@jar",
+            "org.robolectric:utils:${apiCompatVersion}@jar",
+            "org.robolectric:shadowapi:${apiCompatVersion}@jar",
             "org.robolectric:shadows-core:${apiCompatVersion}@jar",
     ]
 
     to = [
             project(":robolectric"),
-            project(":robolectric-annotations"),
-            project(":robolectric-junit"),
-            project(":robolectric-resources"),
-            project(":robolectric-sandbox"),
-            project(":robolectric-shadows/shadows-core"),
-            project(":robolectric-utils"),
-            project(":shadow-api"),
+            project(":annotations"),
+            project(":junit"),
+            project(":resources"),
+            project(":sandbox"),
+            project(":shadows/framework"),
+            project(":utils"),
+            project(":shadowapi"),
     ]
 
     entryPoints += "org.robolectric.RobolectricTestRunner"
diff --git a/robolectric-sandbox/build.gradle b/sandbox/build.gradle
index 426210984..da008de44 100644
--- a/robolectric-sandbox/build.gradle
+++ b/sandbox/build.gradle
@@ -8,9 +8,9 @@ new RoboJavaModulePlugin(
 
 dependencies {
     // Compile dependencies
-    compile project(":robolectric-annotations")
-    compile project(":robolectric-utils")
-    compile project(":shadow-api")
+    compile project(":annotations")
+    compile project(":utils")
+    compile project(":shadowapi")
 
     compile "org.ow2.asm:asm:5.0.1"
     compile "org.ow2.asm:asm-commons:5.0.1"
@@ -20,5 +20,5 @@ dependencies {
     testCompile "junit:junit:4.12"
     testCompile "org.assertj:assertj-core:3.8.0"
     testCompile "org.mockito:mockito-core:2.5.4"
-    testCompile project(":robolectric-junit")
+    testCompile project(":junit")
 }
\ No newline at end of file
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/ClassHandler.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/ClassHandler.java
index 0dde43c8c..0dde43c8c 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/ClassHandler.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/ClassHandler.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/ClassInfo.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/ClassInfo.java
index 5f021cb6f..5f021cb6f 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/ClassInfo.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/ClassInfo.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/DirectObjectMarker.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/DirectObjectMarker.java
index f9219b20a..f9219b20a 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/DirectObjectMarker.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/DirectObjectMarker.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/InstrumentationConfiguration.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/InstrumentationConfiguration.java
index a034f02f0..a034f02f0 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/InstrumentationConfiguration.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/InstrumentationConfiguration.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/Interceptor.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/Interceptor.java
index 8727f9415..8727f9415 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/Interceptor.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/Interceptor.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/Interceptors.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/Interceptors.java
index adcbc9d8e..adcbc9d8e 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/Interceptors.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/Interceptors.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/InvocationProfile.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/InvocationProfile.java
index 88f6e99a1..88f6e99a1 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/InvocationProfile.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/InvocationProfile.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/InvokeDynamic.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/InvokeDynamic.java
index df580c14e..df580c14e 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/InvokeDynamic.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/InvokeDynamic.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/InvokeDynamicSupport.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/InvokeDynamicSupport.java
index 0d921bb7f..0d921bb7f 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/InvokeDynamicSupport.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/InvokeDynamicSupport.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/MethodCallSite.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/MethodCallSite.java
index 48643ea17..48643ea17 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/MethodCallSite.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/MethodCallSite.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/MethodRef.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/MethodRef.java
index 46c1cfb2d..46c1cfb2d 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/MethodRef.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/MethodRef.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/MethodSignature.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/MethodSignature.java
index afc4e2c86..afc4e2c86 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/MethodSignature.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/MethodSignature.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/ProxyMaker.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/ProxyMaker.java
index d61b28423..d61b28423 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/ProxyMaker.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/ProxyMaker.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/RoboCallSite.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/RoboCallSite.java
index 46357b056..46357b056 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/RoboCallSite.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/RoboCallSite.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/RoboType.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/RoboType.java
index 3dd8741ce..3dd8741ce 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/RoboType.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/RoboType.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/RobolectricInternals.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/RobolectricInternals.java
index ce7f9fa87..ce7f9fa87 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/RobolectricInternals.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/RobolectricInternals.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/Sandbox.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/Sandbox.java
index cccaa8d8a..cccaa8d8a 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/Sandbox.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/Sandbox.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/SandboxClassLoader.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/SandboxClassLoader.java
index 0ec3741ad..0ec3741ad 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/SandboxClassLoader.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/SandboxClassLoader.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/SandboxConfig.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/SandboxConfig.java
index 60251bd26..60251bd26 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/SandboxConfig.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/SandboxConfig.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowConfig.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowConfig.java
index e5374d3b5..e5374d3b5 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowConfig.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowConfig.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowConstants.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowConstants.java
index 98dd9b0ef..98dd9b0ef 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowConstants.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowConstants.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowImpl.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowImpl.java
index dac745f01..dac745f01 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowImpl.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowImpl.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowInvalidator.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowInvalidator.java
index 6baa7e57d..6baa7e57d 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowInvalidator.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowInvalidator.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowMap.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowMap.java
index 30e74ebf0..30e74ebf0 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowMap.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowMap.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowWrangler.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowWrangler.java
index 9aac38fd3..9aac38fd3 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowWrangler.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowWrangler.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowedObject.java b/sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowedObject.java
index 8d33076a0..8d33076a0 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowedObject.java
+++ b/sandbox/src/main/java/org/robolectric/internal/bytecode/ShadowedObject.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/util/Function.java b/sandbox/src/main/java/org/robolectric/util/Function.java
index 49ccad1f0..49ccad1f0 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/util/Function.java
+++ b/sandbox/src/main/java/org/robolectric/util/Function.java
diff --git a/robolectric-sandbox/src/main/java/org/robolectric/util/JavaVersion.java b/sandbox/src/main/java/org/robolectric/util/JavaVersion.java
index 7f47b0acd..7f47b0acd 100644
--- a/robolectric-sandbox/src/main/java/org/robolectric/util/JavaVersion.java
+++ b/sandbox/src/main/java/org/robolectric/util/JavaVersion.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/ClassicSuperHandlingTest.java b/sandbox/src/test/java/org/robolectric/ClassicSuperHandlingTest.java
index a01c2ab93..a01c2ab93 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/ClassicSuperHandlingTest.java
+++ b/sandbox/src/test/java/org/robolectric/ClassicSuperHandlingTest.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/JavaVersionTest.java b/sandbox/src/test/java/org/robolectric/JavaVersionTest.java
index dd9a9f7d3..dd9a9f7d3 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/JavaVersionTest.java
+++ b/sandbox/src/test/java/org/robolectric/JavaVersionTest.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/RealApisTest.java b/sandbox/src/test/java/org/robolectric/RealApisTest.java
index 4389599e9..4389599e9 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/RealApisTest.java
+++ b/sandbox/src/test/java/org/robolectric/RealApisTest.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/RobolectricInternalsTest.java b/sandbox/src/test/java/org/robolectric/RobolectricInternalsTest.java
index 45eb9aa6c..45eb9aa6c 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/RobolectricInternalsTest.java
+++ b/sandbox/src/test/java/org/robolectric/RobolectricInternalsTest.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/SandboxClassLoaderTest.java b/sandbox/src/test/java/org/robolectric/SandboxClassLoaderTest.java
index cb885ce6c..cb885ce6c 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/SandboxClassLoaderTest.java
+++ b/sandbox/src/test/java/org/robolectric/SandboxClassLoaderTest.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/ShadowWranglerIntegrationTest.java b/sandbox/src/test/java/org/robolectric/ShadowWranglerIntegrationTest.java
index 5ce3228e8..5ce3228e8 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/ShadowWranglerIntegrationTest.java
+++ b/sandbox/src/test/java/org/robolectric/ShadowWranglerIntegrationTest.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/ShadowingTest.java b/sandbox/src/test/java/org/robolectric/ShadowingTest.java
index af8b506dd..af8b506dd 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/ShadowingTest.java
+++ b/sandbox/src/test/java/org/robolectric/ShadowingTest.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/StaticInitializerTest.java b/sandbox/src/test/java/org/robolectric/StaticInitializerTest.java
index 6b9002fec..6b9002fec 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/StaticInitializerTest.java
+++ b/sandbox/src/test/java/org/robolectric/StaticInitializerTest.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/ThreadSafetyTest.java b/sandbox/src/test/java/org/robolectric/ThreadSafetyTest.java
index 4c03ab2d9..4c03ab2d9 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/ThreadSafetyTest.java
+++ b/sandbox/src/test/java/org/robolectric/ThreadSafetyTest.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/internal/bytecode/ProxyMakerTest.java b/sandbox/src/test/java/org/robolectric/internal/bytecode/ProxyMakerTest.java
index 38aae88fd..38aae88fd 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/internal/bytecode/ProxyMakerTest.java
+++ b/sandbox/src/test/java/org/robolectric/internal/bytecode/ProxyMakerTest.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AChild.java b/sandbox/src/test/java/org/robolectric/testing/AChild.java
index d4c76bf4e..d4c76bf4e 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AChild.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AChild.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassThatCallsAMethodReturningAForgettableClass.java b/sandbox/src/test/java/org/robolectric/testing/AClassThatCallsAMethodReturningAForgettableClass.java
index 74d57b1b8..74d57b1b8 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassThatCallsAMethodReturningAForgettableClass.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AClassThatCallsAMethodReturningAForgettableClass.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassThatExtendsAClassWithFinalEqualsHashCode.java b/sandbox/src/test/java/org/robolectric/testing/AClassThatExtendsAClassWithFinalEqualsHashCode.java
index c34b0b668..c34b0b668 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassThatExtendsAClassWithFinalEqualsHashCode.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AClassThatExtendsAClassWithFinalEqualsHashCode.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassThatRefersToAForgettableClass.java b/sandbox/src/test/java/org/robolectric/testing/AClassThatRefersToAForgettableClass.java
index 63310609c..63310609c 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassThatRefersToAForgettableClass.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AClassThatRefersToAForgettableClass.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassThatRefersToAForgettableClassInItsConstructor.java b/sandbox/src/test/java/org/robolectric/testing/AClassThatRefersToAForgettableClassInItsConstructor.java
index f64cb099e..f64cb099e 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassThatRefersToAForgettableClassInItsConstructor.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AClassThatRefersToAForgettableClassInItsConstructor.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassThatRefersToAForgettableClassInMethodCalls.java b/sandbox/src/test/java/org/robolectric/testing/AClassThatRefersToAForgettableClassInMethodCalls.java
index 6d920745a..6d920745a 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassThatRefersToAForgettableClassInMethodCalls.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AClassThatRefersToAForgettableClassInMethodCalls.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassThatRefersToAForgettableClassInMethodCallsReturningPrimitive.java b/sandbox/src/test/java/org/robolectric/testing/AClassThatRefersToAForgettableClassInMethodCallsReturningPrimitive.java
index 245f0ca2e..245f0ca2e 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassThatRefersToAForgettableClassInMethodCallsReturningPrimitive.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AClassThatRefersToAForgettableClassInMethodCallsReturningPrimitive.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassToForget.java b/sandbox/src/test/java/org/robolectric/testing/AClassToForget.java
index f2b689c03..f2b689c03 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassToForget.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AClassToForget.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassToRemember.java b/sandbox/src/test/java/org/robolectric/testing/AClassToRemember.java
index 7761b7cba..7761b7cba 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassToRemember.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AClassToRemember.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassWithEqualsHashCodeToString.java b/sandbox/src/test/java/org/robolectric/testing/AClassWithEqualsHashCodeToString.java
index 8e9167dc5..8e9167dc5 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassWithEqualsHashCodeToString.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AClassWithEqualsHashCodeToString.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassWithFinalEqualsHashCode.java b/sandbox/src/test/java/org/robolectric/testing/AClassWithFinalEqualsHashCode.java
index e99fccee1..e99fccee1 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassWithFinalEqualsHashCode.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AClassWithFinalEqualsHashCode.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassWithFunnyConstructors.java b/sandbox/src/test/java/org/robolectric/testing/AClassWithFunnyConstructors.java
index 7f4dfeb51..7f4dfeb51 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassWithFunnyConstructors.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AClassWithFunnyConstructors.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassWithMethodReturningArray.java b/sandbox/src/test/java/org/robolectric/testing/AClassWithMethodReturningArray.java
index 40c6becd4..40c6becd4 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassWithMethodReturningArray.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AClassWithMethodReturningArray.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassWithMethodReturningBoolean.java b/sandbox/src/test/java/org/robolectric/testing/AClassWithMethodReturningBoolean.java
index c2fe756d0..c2fe756d0 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassWithMethodReturningBoolean.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AClassWithMethodReturningBoolean.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassWithMethodReturningDouble.java b/sandbox/src/test/java/org/robolectric/testing/AClassWithMethodReturningDouble.java
index 734d6bb79..734d6bb79 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassWithMethodReturningDouble.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AClassWithMethodReturningDouble.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassWithMethodReturningInteger.java b/sandbox/src/test/java/org/robolectric/testing/AClassWithMethodReturningInteger.java
index 71b9eac25..71b9eac25 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassWithMethodReturningInteger.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AClassWithMethodReturningInteger.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassWithNativeMethod.java b/sandbox/src/test/java/org/robolectric/testing/AClassWithNativeMethod.java
index be217a657..be217a657 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassWithNativeMethod.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AClassWithNativeMethod.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassWithNativeMethodReturningPrimitive.java b/sandbox/src/test/java/org/robolectric/testing/AClassWithNativeMethodReturningPrimitive.java
index 41b75b5bb..41b75b5bb 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassWithNativeMethodReturningPrimitive.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AClassWithNativeMethodReturningPrimitive.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassWithNoDefaultConstructor.java b/sandbox/src/test/java/org/robolectric/testing/AClassWithNoDefaultConstructor.java
index d191452df..d191452df 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassWithNoDefaultConstructor.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AClassWithNoDefaultConstructor.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassWithStaticMethod.java b/sandbox/src/test/java/org/robolectric/testing/AClassWithStaticMethod.java
index 0414418a1..0414418a1 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassWithStaticMethod.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AClassWithStaticMethod.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassWithoutEqualsHashCodeToString.java b/sandbox/src/test/java/org/robolectric/testing/AClassWithoutEqualsHashCodeToString.java
index ac194e8c2..ac194e8c2 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AClassWithoutEqualsHashCodeToString.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AClassWithoutEqualsHashCodeToString.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AFinalClass.java b/sandbox/src/test/java/org/robolectric/testing/AFinalClass.java
index c4ce30b2c..c4ce30b2c 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AFinalClass.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AFinalClass.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AGrandparent.java b/sandbox/src/test/java/org/robolectric/testing/AGrandparent.java
index aef9ae1df..aef9ae1df 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AGrandparent.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AGrandparent.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AParent.java b/sandbox/src/test/java/org/robolectric/testing/AParent.java
index b640e4f4a..b640e4f4a 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AParent.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AParent.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AnEnum.java b/sandbox/src/test/java/org/robolectric/testing/AnEnum.java
index f063061c7..f063061c7 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AnEnum.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AnEnum.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AnExampleClass.java b/sandbox/src/test/java/org/robolectric/testing/AnExampleClass.java
index 2e6c07a94..2e6c07a94 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AnExampleClass.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AnExampleClass.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AnInstrumentedChild.java b/sandbox/src/test/java/org/robolectric/testing/AnInstrumentedChild.java
index 7357a3e72..7357a3e72 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AnInstrumentedChild.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AnInstrumentedChild.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AnInstrumentedClassWithoutToStringWithSuperToString.java b/sandbox/src/test/java/org/robolectric/testing/AnInstrumentedClassWithoutToStringWithSuperToString.java
index 4ad06f6e2..4ad06f6e2 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AnInstrumentedClassWithoutToStringWithSuperToString.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AnInstrumentedClassWithoutToStringWithSuperToString.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AnUninstrumentedClass.java b/sandbox/src/test/java/org/robolectric/testing/AnUninstrumentedClass.java
index f4f2bdf78..f4f2bdf78 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AnUninstrumentedClass.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AnUninstrumentedClass.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AnUninstrumentedClassWithToString.java b/sandbox/src/test/java/org/robolectric/testing/AnUninstrumentedClassWithToString.java
index f5bcefe35..f5bcefe35 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AnUninstrumentedClassWithToString.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AnUninstrumentedClassWithToString.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/AnUninstrumentedParent.java b/sandbox/src/test/java/org/robolectric/testing/AnUninstrumentedParent.java
index 6737266ae..6737266ae 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/AnUninstrumentedParent.java
+++ b/sandbox/src/test/java/org/robolectric/testing/AnUninstrumentedParent.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/Foo.java b/sandbox/src/test/java/org/robolectric/testing/Foo.java
index 6034ec27a..6034ec27a 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/Foo.java
+++ b/sandbox/src/test/java/org/robolectric/testing/Foo.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/Pony.java b/sandbox/src/test/java/org/robolectric/testing/Pony.java
index eb8ee85e9..eb8ee85e9 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/Pony.java
+++ b/sandbox/src/test/java/org/robolectric/testing/Pony.java
diff --git a/robolectric-sandbox/src/test/java/org/robolectric/testing/ShadowFoo.java b/sandbox/src/test/java/org/robolectric/testing/ShadowFoo.java
index 2c6334fb8..2c6334fb8 100644
--- a/robolectric-sandbox/src/test/java/org/robolectric/testing/ShadowFoo.java
+++ b/sandbox/src/test/java/org/robolectric/testing/ShadowFoo.java
diff --git a/settings.gradle b/settings.gradle
index 4fa654f07..b6617a3e2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,19 +1,19 @@
 rootProject.name = 'parent'
 
 include ":robolectric"
-include ":robolectric-sandbox"
-include ":robolectric-junit"
-include ":robolectric-utils"
-include ":robolectric-processor"
-include ":robolectric-resources"
-include ":robolectric-annotations"
-include ":robolectric-shadows/shadows-core"
-include ":robolectric-shadows/shadows-httpclient"
-include ":robolectric-shadows/shadows-maps"
-include ":robolectric-shadows/shadows-multidex"
-include ":robolectric-shadows/shadows-play-services"
-include ":robolectric-shadows/shadows-support-v4"
-include ":shadow-api"
+include ":sandbox"
+include ":junit"
+include ":utils"
+include ":processor"
+include ":resources"
+include ":annotations"
+include ":shadows/framework"
+include ":shadows/httpclient"
+include ":shadows/maps"
+include ":shadows/multidex"
+include ":shadows/playservices"
+include ":shadows/supportv4"
+include ":shadowapi"
 include ":integration-tests/dependency-on-stubs"
 include ":integration-tests/libphonenumber"
 include ":integration-tests/mockito"
diff --git a/shadow-api/build.gradle b/shadowapi/build.gradle
index f10e1d33c..f10e1d33c 100644
--- a/shadow-api/build.gradle
+++ b/shadowapi/build.gradle
diff --git a/shadow-api/src/main/java/org/robolectric/annotation/internal/DoNotInstrument.java b/shadowapi/src/main/java/org/robolectric/annotation/internal/DoNotInstrument.java
index 4a77d97ab..4a77d97ab 100644
--- a/shadow-api/src/main/java/org/robolectric/annotation/internal/DoNotInstrument.java
+++ b/shadowapi/src/main/java/org/robolectric/annotation/internal/DoNotInstrument.java
diff --git a/shadow-api/src/main/java/org/robolectric/annotation/internal/Instrument.java b/shadowapi/src/main/java/org/robolectric/annotation/internal/Instrument.java
index c53e72ca2..c53e72ca2 100644
--- a/shadow-api/src/main/java/org/robolectric/annotation/internal/Instrument.java
+++ b/shadowapi/src/main/java/org/robolectric/annotation/internal/Instrument.java
diff --git a/shadow-api/src/main/java/org/robolectric/internal/IShadow.java b/shadowapi/src/main/java/org/robolectric/internal/IShadow.java
index 045989ca2..045989ca2 100644
--- a/shadow-api/src/main/java/org/robolectric/internal/IShadow.java
+++ b/shadowapi/src/main/java/org/robolectric/internal/IShadow.java
diff --git a/shadow-api/src/main/java/org/robolectric/internal/Shadow.java b/shadowapi/src/main/java/org/robolectric/internal/Shadow.java
index d25bd20dc..d25bd20dc 100644
--- a/shadow-api/src/main/java/org/robolectric/internal/Shadow.java
+++ b/shadowapi/src/main/java/org/robolectric/internal/Shadow.java
diff --git a/shadow-api/src/main/java/org/robolectric/internal/ShadowExtractor.java b/shadowapi/src/main/java/org/robolectric/internal/ShadowExtractor.java
index 9beb769e4..9beb769e4 100644
--- a/shadow-api/src/main/java/org/robolectric/internal/ShadowExtractor.java
+++ b/shadowapi/src/main/java/org/robolectric/internal/ShadowExtractor.java
diff --git a/shadow-api/src/main/java/org/robolectric/internal/ShadowProvider.java b/shadowapi/src/main/java/org/robolectric/internal/ShadowProvider.java
index c8b46045d..c8b46045d 100644
--- a/shadow-api/src/main/java/org/robolectric/internal/ShadowProvider.java
+++ b/shadowapi/src/main/java/org/robolectric/internal/ShadowProvider.java
diff --git a/shadow-api/src/main/java/org/robolectric/shadow/api/Shadow.java b/shadowapi/src/main/java/org/robolectric/shadow/api/Shadow.java
index d802b2c93..d802b2c93 100644
--- a/shadow-api/src/main/java/org/robolectric/shadow/api/Shadow.java
+++ b/shadowapi/src/main/java/org/robolectric/shadow/api/Shadow.java
diff --git a/shadow-api/src/main/java/org/robolectric/util/ReflectionHelpers.java b/shadowapi/src/main/java/org/robolectric/util/ReflectionHelpers.java
index b32e409db..b32e409db 100644
--- a/shadow-api/src/main/java/org/robolectric/util/ReflectionHelpers.java
+++ b/shadowapi/src/main/java/org/robolectric/util/ReflectionHelpers.java
diff --git a/shadow-api/src/test/java/org/robolectric/util/ReflectionHelpersTest.java b/shadowapi/src/test/java/org/robolectric/util/ReflectionHelpersTest.java
index 6b3f7cf67..6b3f7cf67 100644
--- a/shadow-api/src/test/java/org/robolectric/util/ReflectionHelpersTest.java
+++ b/shadowapi/src/test/java/org/robolectric/util/ReflectionHelpersTest.java
diff --git a/robolectric-shadows/shadows-core/build.gradle b/shadows/framework/build.gradle
index da77c15c5..c78b995ee 100644
--- a/robolectric-shadows/shadows-core/build.gradle
+++ b/shadows/framework/build.gradle
@@ -48,9 +48,9 @@ install {
 
 dependencies {
     // Project dependencies
-    compile project(":robolectric-annotations")
-    compile project(":robolectric-resources")
-    compile project(":robolectric-utils")
+    compile project(":annotations")
+    compile project(":resources")
+    compile project(":utils")
 
     // Compile dependencies
     compileOnly "com.google.code.findbugs:jsr305:3.0.1"
diff --git a/robolectric-shadows/shadows-core/src/main/java/android/webkit/RoboCookieManager.java b/shadows/framework/src/main/java/android/webkit/RoboCookieManager.java
index 600620091..600620091 100644
--- a/robolectric-shadows/shadows-core/src/main/java/android/webkit/RoboCookieManager.java
+++ b/shadows/framework/src/main/java/android/webkit/RoboCookieManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/RuntimeEnvironment.java b/shadows/framework/src/main/java/org/robolectric/RuntimeEnvironment.java
index 8442dfd61..8442dfd61 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/RuntimeEnvironment.java
+++ b/shadows/framework/src/main/java/org/robolectric/RuntimeEnvironment.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/ShadowsAdapter.java b/shadows/framework/src/main/java/org/robolectric/ShadowsAdapter.java
index a837d574a..a837d574a 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/ShadowsAdapter.java
+++ b/shadows/framework/src/main/java/org/robolectric/ShadowsAdapter.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/android/AccessibilityUtil.java b/shadows/framework/src/main/java/org/robolectric/android/AccessibilityUtil.java
index 1afd33da5..1afd33da5 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/android/AccessibilityUtil.java
+++ b/shadows/framework/src/main/java/org/robolectric/android/AccessibilityUtil.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/android/XmlResourceParserImpl.java b/shadows/framework/src/main/java/org/robolectric/android/XmlResourceParserImpl.java
index aa8f998c6..aa8f998c6 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/android/XmlResourceParserImpl.java
+++ b/shadows/framework/src/main/java/org/robolectric/android/XmlResourceParserImpl.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/android/util/concurrent/RoboExecutorService.java b/shadows/framework/src/main/java/org/robolectric/android/util/concurrent/RoboExecutorService.java
index 66a39f525..66a39f525 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/android/util/concurrent/RoboExecutorService.java
+++ b/shadows/framework/src/main/java/org/robolectric/android/util/concurrent/RoboExecutorService.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/fakes/BaseCursor.java b/shadows/framework/src/main/java/org/robolectric/fakes/BaseCursor.java
index 4e60e029e..4e60e029e 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/fakes/BaseCursor.java
+++ b/shadows/framework/src/main/java/org/robolectric/fakes/BaseCursor.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/fakes/RoboCursor.java b/shadows/framework/src/main/java/org/robolectric/fakes/RoboCursor.java
index 1673537b3..1673537b3 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/fakes/RoboCursor.java
+++ b/shadows/framework/src/main/java/org/robolectric/fakes/RoboCursor.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/fakes/RoboIntentSender.java b/shadows/framework/src/main/java/org/robolectric/fakes/RoboIntentSender.java
index 1e7403c3c..1e7403c3c 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/fakes/RoboIntentSender.java
+++ b/shadows/framework/src/main/java/org/robolectric/fakes/RoboIntentSender.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/fakes/RoboMenu.java b/shadows/framework/src/main/java/org/robolectric/fakes/RoboMenu.java
index d720cf6dd..d720cf6dd 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/fakes/RoboMenu.java
+++ b/shadows/framework/src/main/java/org/robolectric/fakes/RoboMenu.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/fakes/RoboMenuItem.java b/shadows/framework/src/main/java/org/robolectric/fakes/RoboMenuItem.java
index 47ec6f8ce..47ec6f8ce 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/fakes/RoboMenuItem.java
+++ b/shadows/framework/src/main/java/org/robolectric/fakes/RoboMenuItem.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/fakes/RoboSubMenu.java b/shadows/framework/src/main/java/org/robolectric/fakes/RoboSubMenu.java
index 2a5d6c7da..2a5d6c7da 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/fakes/RoboSubMenu.java
+++ b/shadows/framework/src/main/java/org/robolectric/fakes/RoboSubMenu.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/fakes/RoboVibrator.java b/shadows/framework/src/main/java/org/robolectric/fakes/RoboVibrator.java
index e0e54f693..e0e54f693 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/fakes/RoboVibrator.java
+++ b/shadows/framework/src/main/java/org/robolectric/fakes/RoboVibrator.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/fakes/RoboWebSettings.java b/shadows/framework/src/main/java/org/robolectric/fakes/RoboWebSettings.java
index d97c37583..d97c37583 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/fakes/RoboWebSettings.java
+++ b/shadows/framework/src/main/java/org/robolectric/fakes/RoboWebSettings.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/fakes/package-info.java b/shadows/framework/src/main/java/org/robolectric/fakes/package-info.java
index 38e02cabb..38e02cabb 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/fakes/package-info.java
+++ b/shadows/framework/src/main/java/org/robolectric/fakes/package-info.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/res/builder/RobolectricPackageManager.java b/shadows/framework/src/main/java/org/robolectric/res/builder/RobolectricPackageManager.java
index 34e35c9bc..34e35c9bc 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/res/builder/RobolectricPackageManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/res/builder/RobolectricPackageManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/res/builder/XmlResourceParserImpl.java b/shadows/framework/src/main/java/org/robolectric/res/builder/XmlResourceParserImpl.java
index 6b2ddf3d1..6b2ddf3d1 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/res/builder/XmlResourceParserImpl.java
+++ b/shadows/framework/src/main/java/org/robolectric/res/builder/XmlResourceParserImpl.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/Converter.java b/shadows/framework/src/main/java/org/robolectric/shadows/Converter.java
index 967f15865..967f15865 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/Converter.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/Converter.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/CoreShadowsAdapter.java b/shadows/framework/src/main/java/org/robolectric/shadows/CoreShadowsAdapter.java
index 22282a26f..22282a26f 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/CoreShadowsAdapter.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/CoreShadowsAdapter.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ImageUtil.java b/shadows/framework/src/main/java/org/robolectric/shadows/ImageUtil.java
index 208488c51..208488c51 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ImageUtil.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ImageUtil.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/Provider.java b/shadows/framework/src/main/java/org/robolectric/shadows/Provider.java
index 41a364603..41a364603 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/Provider.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/Provider.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ResourceHelper.java b/shadows/framework/src/main/java/org/robolectric/shadows/ResourceHelper.java
index ad4f7a606..ad4f7a606 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ResourceHelper.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ResourceHelper.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/RoboLayoutInflater.java b/shadows/framework/src/main/java/org/robolectric/shadows/RoboLayoutInflater.java
index f7cc46c95..f7cc46c95 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/RoboLayoutInflater.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/RoboLayoutInflater.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAbsListView.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAbsListView.java
index 5b2d8e1b9..5b2d8e1b9 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAbsListView.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAbsListView.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAbsSeekBar.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAbsSeekBar.java
index 6971d990c..6971d990c 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAbsSeekBar.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAbsSeekBar.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAbsSpinner.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAbsSpinner.java
index e24a2f6b1..e24a2f6b1 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAbsSpinner.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAbsSpinner.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAbstractCursor.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAbstractCursor.java
index 24e384571..24e384571 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAbstractCursor.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAbstractCursor.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAccessibilityEvent.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAccessibilityEvent.java
index 6b0c968c5..6b0c968c5 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAccessibilityEvent.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAccessibilityEvent.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAccessibilityManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAccessibilityManager.java
index c11dcacf0..c11dcacf0 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAccessibilityManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAccessibilityManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAccessibilityNodeInfo.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAccessibilityNodeInfo.java
index 6ba7232b3..6ba7232b3 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAccessibilityNodeInfo.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAccessibilityNodeInfo.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAccessibilityRecord.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAccessibilityRecord.java
index 0f4e4bc05..0f4e4bc05 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAccessibilityRecord.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAccessibilityRecord.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAccessibilityService.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAccessibilityService.java
index 792582dfa..792582dfa 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAccessibilityService.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAccessibilityService.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAccessibilityWindowInfo.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAccessibilityWindowInfo.java
index f2cf50d8d..f2cf50d8d 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAccessibilityWindowInfo.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAccessibilityWindowInfo.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAccountManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAccountManager.java
index f8b715cdf..f8b715cdf 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAccountManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAccountManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowActivity.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowActivity.java
index b1d9cde61..b1d9cde61 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowActivity.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowActivity.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowActivityGroup.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowActivityGroup.java
index 0e47b1331..0e47b1331 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowActivityGroup.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowActivityGroup.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowActivityManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowActivityManager.java
index 1baade3dc..1baade3dc 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowActivityManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowActivityManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowActivityManagerNative.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowActivityManagerNative.java
index 045a771dd..045a771dd 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowActivityManagerNative.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowActivityManagerNative.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowActivityThread.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowActivityThread.java
index dfdaaf880..dfdaaf880 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowActivityThread.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowActivityThread.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAdapterView.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAdapterView.java
index ae2723cf4..ae2723cf4 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAdapterView.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAdapterView.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAlarmManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAlarmManager.java
index d4f1217aa..d4f1217aa 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAlarmManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAlarmManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAlertController.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAlertController.java
index 5280053f6..5280053f6 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAlertController.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAlertController.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAlertDialog.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAlertDialog.java
index d737f2b74..d737f2b74 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAlertDialog.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAlertDialog.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAndroidBidi.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAndroidBidi.java
index e64f417a4..e64f417a4 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAndroidBidi.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAndroidBidi.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAnimationBridge.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAnimationBridge.java
index 7884df15d..7884df15d 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAnimationBridge.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAnimationBridge.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAnimationUtils.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAnimationUtils.java
index 5b5915f34..5b5915f34 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAnimationUtils.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAnimationUtils.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAppWidgetHost.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAppWidgetHost.java
index 21f97cd17..21f97cd17 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAppWidgetHost.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAppWidgetHost.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAppWidgetHostView.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAppWidgetHostView.java
index 69562320d..69562320d 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAppWidgetHostView.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAppWidgetHostView.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAppWidgetManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAppWidgetManager.java
index 722b12298..722b12298 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAppWidgetManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAppWidgetManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowApplication.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowApplication.java
index c8d58fd0f..c8d58fd0f 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowApplication.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowApplication.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowApplicationPackageManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowApplicationPackageManager.java
index 15a9613f3..15a9613f3 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowApplicationPackageManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowApplicationPackageManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowArrayAdapter.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowArrayAdapter.java
index cf2ea0e1b..cf2ea0e1b 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowArrayAdapter.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowArrayAdapter.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAssetManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAssetManager.java
index 00a86df64..00a86df64 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAssetManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAssetManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAsyncTask.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAsyncTask.java
index 186bb4547..186bb4547 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAsyncTask.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAsyncTask.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAsyncTaskBridge.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAsyncTaskBridge.java
index d00888904..d00888904 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAsyncTaskBridge.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAsyncTaskBridge.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAsyncTaskLoader.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAsyncTaskLoader.java
index 4d8802869..4d8802869 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAsyncTaskLoader.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAsyncTaskLoader.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAudioEffect.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAudioEffect.java
index 499af9624..499af9624 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAudioEffect.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAudioEffect.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAudioManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAudioManager.java
index c42c67f05..c42c67f05 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAudioManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAudioManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBackgroundThread.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBackgroundThread.java
index 41ce34686..41ce34686 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBackgroundThread.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBackgroundThread.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBaseAdapter.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBaseAdapter.java
index a922cf08a..a922cf08a 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBaseAdapter.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBaseAdapter.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBatteryManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBatteryManager.java
index a6cc80dc1..a6cc80dc1 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBatteryManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBatteryManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBinder.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBinder.java
index 40746a670..40746a670 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBinder.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBinder.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBinderBridge.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBinderBridge.java
index 0bbe204a0..0bbe204a0 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBinderBridge.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBinderBridge.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBitmap.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBitmap.java
index efe290ba0..efe290ba0 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBitmap.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBitmap.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBitmapDrawable.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBitmapDrawable.java
index fcccda1d9..fcccda1d9 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBitmapDrawable.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBitmapDrawable.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBitmapFactory.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBitmapFactory.java
index d7b20adfc..d7b20adfc 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBitmapFactory.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBitmapFactory.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBitmapRegionDecoder.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBitmapRegionDecoder.java
index b7e691c70..b7e691c70 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBitmapRegionDecoder.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBitmapRegionDecoder.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBitmapShader.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBitmapShader.java
index cbedaa5f9..cbedaa5f9 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBitmapShader.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBitmapShader.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBluetoothAdapter.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBluetoothAdapter.java
index 2b3d5078f..2b3d5078f 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBluetoothAdapter.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBluetoothAdapter.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBluetoothDevice.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBluetoothDevice.java
index 0de44f15a..0de44f15a 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBluetoothDevice.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBluetoothDevice.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBluetoothManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBluetoothManager.java
index 4588c9ef1..4588c9ef1 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBluetoothManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBluetoothManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBroadcastPendingResult.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBroadcastPendingResult.java
index 6f4116836..6f4116836 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBroadcastPendingResult.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBroadcastPendingResult.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBroadcastReceiver.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBroadcastReceiver.java
index 77c471d8b..77c471d8b 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowBroadcastReceiver.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowBroadcastReceiver.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowCamera.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowCamera.java
index 80c7e279b..80c7e279b 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowCamera.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowCamera.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowCanvas.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowCanvas.java
index c05357884..c05357884 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowCanvas.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowCanvas.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowChoreographer.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowChoreographer.java
index acf778631..acf778631 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowChoreographer.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowChoreographer.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowClipboardManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowClipboardManager.java
index eae66d4c1..eae66d4c1 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowClipboardManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowClipboardManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowColor.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowColor.java
index bd2b35a8b..bd2b35a8b 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowColor.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowColor.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowColorMatrix.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowColorMatrix.java
index 53fe41e9b..53fe41e9b 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowColorMatrix.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowColorMatrix.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowColorMatrixColorFilter.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowColorMatrixColorFilter.java
index 2474e10c4..2474e10c4 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowColorMatrixColorFilter.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowColorMatrixColorFilter.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowCompoundButton.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowCompoundButton.java
index c732fd17a..c732fd17a 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowCompoundButton.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowCompoundButton.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowConnectivityManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowConnectivityManager.java
index 56f89f412..56f89f412 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowConnectivityManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowConnectivityManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContentObserver.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowContentObserver.java
index 247a74978..247a74978 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContentObserver.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowContentObserver.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContentProvider.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowContentProvider.java
index e270c69aa..e270c69aa 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContentProvider.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowContentProvider.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContentProviderClient.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowContentProviderClient.java
index e112bd6b1..e112bd6b1 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContentProviderClient.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowContentProviderClient.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContentProviderOperation.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowContentProviderOperation.java
index 364c533b6..364c533b6 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContentProviderOperation.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowContentProviderOperation.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContentProviderResult.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowContentProviderResult.java
index 13eb626ba..13eb626ba 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContentProviderResult.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowContentProviderResult.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContentResolver.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowContentResolver.java
index 67a9f506e..67a9f506e 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContentResolver.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowContentResolver.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContentUris.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowContentUris.java
index dc04fe2bb..dc04fe2bb 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContentUris.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowContentUris.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContextImpl.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowContextImpl.java
index c17ae1d6f..c17ae1d6f 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContextImpl.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowContextImpl.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContextThemeWrapper.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowContextThemeWrapper.java
index 5f569b951..5f569b951 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContextThemeWrapper.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowContextThemeWrapper.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContextWrapper.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowContextWrapper.java
index 48c072969..48c072969 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowContextWrapper.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowContextWrapper.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowCookieManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowCookieManager.java
index 35d516aab..35d516aab 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowCookieManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowCookieManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowCookieSyncManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowCookieSyncManager.java
index 7d8cae343..7d8cae343 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowCookieSyncManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowCookieSyncManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowCornerPathEffect.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowCornerPathEffect.java
index ba3f992d2..ba3f992d2 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowCornerPathEffect.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowCornerPathEffect.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowCountDownTimer.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowCountDownTimer.java
index ada56c47d..ada56c47d 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowCountDownTimer.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowCountDownTimer.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowCursorAdapter.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowCursorAdapter.java
index 8bbb2268b..8bbb2268b 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowCursorAdapter.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowCursorAdapter.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowCursorWindow.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowCursorWindow.java
index edd311ef3..edd311ef3 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowCursorWindow.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowCursorWindow.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowCursorWrapper.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowCursorWrapper.java
index 8d6216c66..8d6216c66 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowCursorWrapper.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowCursorWrapper.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowDashPathEffect.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDashPathEffect.java
index ac7480a16..ac7480a16 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowDashPathEffect.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDashPathEffect.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowDateFormat.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDateFormat.java
index 3be4ece4c..3be4ece4c 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowDateFormat.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDateFormat.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowDateIntervalFormat.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDateIntervalFormat.java
index 1d8b8ac65..1d8b8ac65 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowDateIntervalFormat.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDateIntervalFormat.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowDatePickerDialog.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDatePickerDialog.java
index 8cd3933f9..8cd3933f9 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowDatePickerDialog.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDatePickerDialog.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowDebug.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDebug.java
index 1ce049d2b..1ce049d2b 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowDebug.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDebug.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowDialog.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDialog.java
index 1504cf61a..1504cf61a 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowDialog.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDialog.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowDisplay.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDisplay.java
index 5b1052a08..5b1052a08 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowDisplay.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDisplay.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowDisplayManagerGlobal.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDisplayManagerGlobal.java
index 67b911b83..67b911b83 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowDisplayManagerGlobal.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDisplayManagerGlobal.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowDownloadManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDownloadManager.java
index 5da7574bb..5da7574bb 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowDownloadManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDownloadManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowDrawable.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDrawable.java
index 9fed896b2..9fed896b2 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowDrawable.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDrawable.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowEdgeEffect.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowEdgeEffect.java
index cff64340e..cff64340e 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowEdgeEffect.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowEdgeEffect.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowEnvironment.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowEnvironment.java
index 21f876ae9..21f876ae9 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowEnvironment.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowEnvironment.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowExifInterface.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowExifInterface.java
index c84a422fa..c84a422fa 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowExifInterface.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowExifInterface.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowExpandableListView.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowExpandableListView.java
index 1403394d6..1403394d6 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowExpandableListView.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowExpandableListView.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowFilter.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowFilter.java
index f0b621397..f0b621397 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowFilter.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowFilter.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowFloatMath.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowFloatMath.java
index bcec84242..bcec84242 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowFloatMath.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowFloatMath.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowFrameLayout.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowFrameLayout.java
index fc74c1e11..fc74c1e11 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowFrameLayout.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowFrameLayout.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowGestureDetector.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowGestureDetector.java
index 75a5c6627..75a5c6627 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowGestureDetector.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowGestureDetector.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowGradientDrawable.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowGradientDrawable.java
index 7de6ca58c..7de6ca58c 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowGradientDrawable.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowGradientDrawable.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowHandler.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowHandler.java
index ca7f3d983..ca7f3d983 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowHandler.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowHandler.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowHttpResponseCache.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowHttpResponseCache.java
index 1ca1fbba0..1ca1fbba0 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowHttpResponseCache.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowHttpResponseCache.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowIAppOpsService.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowIAppOpsService.java
index 271c25cc6..271c25cc6 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowIAppOpsService.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowIAppOpsService.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowICU.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowICU.java
index eb8b35cf0..eb8b35cf0 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowICU.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowICU.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowIcon.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowIcon.java
index 2c9410586..2c9410586 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowIcon.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowIcon.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowInputDevice.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowInputDevice.java
index f94d1b333..f94d1b333 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowInputDevice.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowInputDevice.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowInputEvent.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowInputEvent.java
index 457be7053..457be7053 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowInputEvent.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowInputEvent.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowInputMethodManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowInputMethodManager.java
index ad73bfd11..ad73bfd11 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowInputMethodManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowInputMethodManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowIntent.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowIntent.java
index bcce460ee..bcce460ee 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowIntent.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowIntent.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowIntentService.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowIntentService.java
index 3b8c4a767..3b8c4a767 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowIntentService.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowIntentService.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowIoUtils.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowIoUtils.java
index 2c1fab12e..2c1fab12e 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowIoUtils.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowIoUtils.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowJobScheduler.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowJobScheduler.java
index aa4984f01..aa4984f01 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowJobScheduler.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowJobScheduler.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowJsPromptResult.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowJsPromptResult.java
index 6334df14e..6334df14e 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowJsPromptResult.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowJsPromptResult.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowJsResult.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowJsResult.java
index aa6429318..aa6429318 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowJsResult.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowJsResult.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowKeyCharacterMap.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowKeyCharacterMap.java
index 1be74b227..1be74b227 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowKeyCharacterMap.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowKeyCharacterMap.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowKeyguardManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowKeyguardManager.java
index 201d504e5..201d504e5 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowKeyguardManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowKeyguardManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowLayoutAnimationController.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowLayoutAnimationController.java
index ec6650512..ec6650512 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowLayoutAnimationController.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowLayoutAnimationController.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowLinearGradient.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowLinearGradient.java
index 6f7542ec3..6f7542ec3 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowLinearGradient.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowLinearGradient.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowLinearLayout.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowLinearLayout.java
index c51eaac68..c51eaac68 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowLinearLayout.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowLinearLayout.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowLinkMovementMethod.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowLinkMovementMethod.java
index 0286c0919..0286c0919 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowLinkMovementMethod.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowLinkMovementMethod.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowLinux.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowLinux.java
index 68515f227..68515f227 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowLinux.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowLinux.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowListPopupWindow.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowListPopupWindow.java
index afbdec8d2..afbdec8d2 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowListPopupWindow.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowListPopupWindow.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowListView.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowListView.java
index cdcec8bed..cdcec8bed 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowListView.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowListView.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowLoadedApk.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowLoadedApk.java
index 8952ec426..8952ec426 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowLoadedApk.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowLoadedApk.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowLocalActivityManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowLocalActivityManager.java
index 147cd4b24..147cd4b24 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowLocalActivityManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowLocalActivityManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowLocaleData.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowLocaleData.java
index 57364b35e..57364b35e 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowLocaleData.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowLocaleData.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowLocationManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowLocationManager.java
index 2481589d3..2481589d3 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowLocationManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowLocationManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowLog.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowLog.java
index a7024db8b..a7024db8b 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowLog.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowLog.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowLooper.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowLooper.java
index 0211b703c..0211b703c 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowLooper.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowLooper.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMatrix.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMatrix.java
index af595fc02..af595fc02 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMatrix.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMatrix.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMediaMetadataRetriever.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMediaMetadataRetriever.java
index 789b4eafd..789b4eafd 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMediaMetadataRetriever.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMediaMetadataRetriever.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMediaPlayer.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMediaPlayer.java
index 80a59c9bb..80a59c9bb 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMediaPlayer.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMediaPlayer.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMediaRecorder.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMediaRecorder.java
index 492c5361f..492c5361f 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMediaRecorder.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMediaRecorder.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMediaRouter.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMediaRouter.java
index 8f96eab32..8f96eab32 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMediaRouter.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMediaRouter.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMediaScannerConnection.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMediaScannerConnection.java
index 06e7327b9..06e7327b9 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMediaScannerConnection.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMediaScannerConnection.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMediaStore.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMediaStore.java
index 07224c61f..07224c61f 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMediaStore.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMediaStore.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMemoryMappedFile.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMemoryMappedFile.java
index 30bdf2aec..30bdf2aec 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMemoryMappedFile.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMemoryMappedFile.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMessage.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMessage.java
index d9148c642..d9148c642 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMessage.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMessage.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMessageQueue.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMessageQueue.java
index 656ca349b..656ca349b 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMessageQueue.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMessageQueue.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMessenger.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMessenger.java
index fceb2f9e8..fceb2f9e8 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMessenger.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMessenger.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMimeTypeMap.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMimeTypeMap.java
index a167ed472..a167ed472 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMimeTypeMap.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMimeTypeMap.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMotionEvent.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMotionEvent.java
index f6677bfd1..f6677bfd1 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowMotionEvent.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMotionEvent.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowNativeAllocationRegistry.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativeAllocationRegistry.java
index fbb86db32..fbb86db32 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowNativeAllocationRegistry.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativeAllocationRegistry.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowNetwork.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNetwork.java
index d1b85cf3d..d1b85cf3d 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowNetwork.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNetwork.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowNetworkInfo.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNetworkInfo.java
index 24b5657c6..24b5657c6 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowNetworkInfo.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNetworkInfo.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowNfcAdapter.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNfcAdapter.java
index 0fdf14c59..0fdf14c59 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowNfcAdapter.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNfcAdapter.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowNinePatch.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNinePatch.java
index 52257031e..52257031e 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowNinePatch.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNinePatch.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowNotification.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNotification.java
index 8c7ead1bd..8c7ead1bd 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowNotification.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNotification.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowNotificationManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNotificationManager.java
index cd4c0a045..cd4c0a045 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowNotificationManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNotificationManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowNumberPicker.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNumberPicker.java
index 7b403480e..7b403480e 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowNumberPicker.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNumberPicker.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowObjectAnimator.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowObjectAnimator.java
index ff69e55a8..ff69e55a8 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowObjectAnimator.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowObjectAnimator.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowOpenGLMatrix.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowOpenGLMatrix.java
index 6bec3f8ff..6bec3f8ff 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowOpenGLMatrix.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowOpenGLMatrix.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowOutline.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowOutline.java
index ff69bd364..ff69bd364 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowOutline.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowOutline.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowOverScroller.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowOverScroller.java
index 83dec6b9d..83dec6b9d 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowOverScroller.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowOverScroller.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPackageInstaller.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPackageInstaller.java
index c89bfe15f..c89bfe15f 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPackageInstaller.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPackageInstaller.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPackageManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPackageManager.java
index f01925688..f01925688 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPackageManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPackageManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPaint.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPaint.java
index 64150fd93..64150fd93 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPaint.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPaint.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowParcel.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowParcel.java
index f536a2597..f536a2597 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowParcel.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowParcel.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowParcelFileDescriptor.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowParcelFileDescriptor.java
index 8178fb00e..8178fb00e 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowParcelFileDescriptor.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowParcelFileDescriptor.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPath.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPath.java
index 433c45a49..433c45a49 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPath.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPath.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPathParser.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPathParser.java
index 33cd41d88..33cd41d88 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPathParser.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPathParser.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPendingIntent.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPendingIntent.java
index 8fecf828e..8fecf828e 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPendingIntent.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPendingIntent.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPhoneWindow.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPhoneWindow.java
index 1ea666ab9..1ea666ab9 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPhoneWindow.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPhoneWindow.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPhoneWindowFor22.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPhoneWindowFor22.java
index 112536735..112536735 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPhoneWindowFor22.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPhoneWindowFor22.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPicture.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPicture.java
index 46445d065..46445d065 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPicture.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPicture.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPlayerBase.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPlayerBase.java
index 8db9609ef..8db9609ef 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPlayerBase.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPlayerBase.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPopupMenu.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPopupMenu.java
index 46337dce6..46337dce6 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPopupMenu.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPopupMenu.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPopupWindow.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPopupWindow.java
index a91efd91e..a91efd91e 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPopupWindow.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPopupWindow.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPorterDuffColorFilter.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPorterDuffColorFilter.java
index 0ddeba24e..0ddeba24e 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPorterDuffColorFilter.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPorterDuffColorFilter.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPosix.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPosix.java
index d2534c82c..d2534c82c 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPosix.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPosix.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPowerManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPowerManager.java
index d10acb877..d10acb877 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPowerManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPowerManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPreference.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPreference.java
index 9772246e3..9772246e3 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowPreference.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowPreference.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowProcess.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowProcess.java
index 30ad3fc57..30ad3fc57 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowProcess.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowProcess.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowProgressBar.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowProgressBar.java
index ef9666077..ef9666077 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowProgressBar.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowProgressBar.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowProgressDialog.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowProgressDialog.java
index d53f64c66..d53f64c66 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowProgressDialog.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowProgressDialog.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowQueuedWork.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowQueuedWork.java
index 273d9b2b2..273d9b2b2 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowQueuedWork.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowQueuedWork.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowRegion.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowRegion.java
index 1b3734658..1b3734658 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowRegion.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowRegion.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowRelativeLayout.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowRelativeLayout.java
index ed46d6da8..ed46d6da8 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowRelativeLayout.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowRelativeLayout.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowRemoteCallbackList.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowRemoteCallbackList.java
index b58256185..b58256185 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowRemoteCallbackList.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowRemoteCallbackList.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowRenderNode.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowRenderNode.java
index 71ee443da..71ee443da 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowRenderNode.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowRenderNode.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowRenderNodeAnimator.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowRenderNodeAnimator.java
index 2b74eb108..2b74eb108 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowRenderNodeAnimator.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowRenderNodeAnimator.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowResolveInfo.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowResolveInfo.java
index 6262cc3e9..6262cc3e9 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowResolveInfo.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowResolveInfo.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowResourceManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowResourceManager.java
index 8d56907ec..8d56907ec 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowResourceManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowResourceManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowResources.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowResources.java
index f29aff037..f29aff037 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowResources.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowResources.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowResourcesImpl.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowResourcesImpl.java
index 90af2249c..90af2249c 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowResourcesImpl.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowResourcesImpl.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowResultReceiver.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowResultReceiver.java
index b31fe20c2..b31fe20c2 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowResultReceiver.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowResultReceiver.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSQLiteConnection.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSQLiteConnection.java
index 37dc9db9d..37dc9db9d 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSQLiteConnection.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSQLiteConnection.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowScaleGestureDetector.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowScaleGestureDetector.java
index 42ba07245..42ba07245 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowScaleGestureDetector.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowScaleGestureDetector.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowScanResult.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowScanResult.java
index 42cc52cb8..42cc52cb8 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowScanResult.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowScanResult.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowScrollView.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowScrollView.java
index a6281e042..a6281e042 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowScrollView.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowScrollView.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowScroller.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowScroller.java
index 40edd9dad..40edd9dad 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowScroller.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowScroller.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSearchManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSearchManager.java
index 57324391c..57324391c 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSearchManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSearchManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSeekBar.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSeekBar.java
index 3279cc4cc..3279cc4cc 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSeekBar.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSeekBar.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSensorManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSensorManager.java
index e036ba7f1..e036ba7f1 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSensorManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSensorManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowService.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowService.java
index b4be805c8..b4be805c8 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowService.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowService.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowServiceManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowServiceManager.java
index f74203e12..f74203e12 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowServiceManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowServiceManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSettings.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSettings.java
index 97cdf1406..97cdf1406 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSettings.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSettings.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSmsManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSmsManager.java
index d22383d41..d22383d41 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSmsManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSmsManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSocketTagger.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSocketTagger.java
index b36c3bc79..b36c3bc79 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSocketTagger.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSocketTagger.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSoundPool.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSoundPool.java
index 25912fac6..25912fac6 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSoundPool.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSoundPool.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSpellChecker.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSpellChecker.java
index d5f6b21f0..d5f6b21f0 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSpellChecker.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSpellChecker.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSslErrorHandler.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSslErrorHandler.java
index c8ab6ab9c..c8ab6ab9c 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSslErrorHandler.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSslErrorHandler.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowStatFs.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowStatFs.java
index 4ae7e99c1..4ae7e99c1 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowStatFs.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowStatFs.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowStateListDrawable.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowStateListDrawable.java
index a7d3dd9f2..a7d3dd9f2 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowStateListDrawable.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowStateListDrawable.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowStaticLayout.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowStaticLayout.java
index ac14ef803..ac14ef803 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowStaticLayout.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowStaticLayout.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowStrictMode.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowStrictMode.java
index 8a238845e..8a238845e 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowStrictMode.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowStrictMode.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSurface.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSurface.java
index 0e0bba39a..0e0bba39a 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSurface.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSurface.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSurfaceView.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSurfaceView.java
index f483dc1d5..f483dc1d5 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSurfaceView.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSurfaceView.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSystemClock.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSystemClock.java
index cbc3c8181..cbc3c8181 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSystemClock.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSystemClock.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSystemProperties.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSystemProperties.java
index 5334efc1b..5334efc1b 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowSystemProperties.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowSystemProperties.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTabActivity.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTabActivity.java
index 5bec4db81..5bec4db81 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTabActivity.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTabActivity.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTabHost.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTabHost.java
index 10cc0b89f..10cc0b89f 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTabHost.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTabHost.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTabWidget.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTabWidget.java
index 9afb07985..9afb07985 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTabWidget.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTabWidget.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTelecomManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTelecomManager.java
index 8d1760c3d..8d1760c3d 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTelecomManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTelecomManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTelephonyManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTelephonyManager.java
index 64f497920..64f497920 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTelephonyManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTelephonyManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTextPaint.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTextPaint.java
index ebb004949..ebb004949 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTextPaint.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTextPaint.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTextToSpeech.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTextToSpeech.java
index 6e5591688..6e5591688 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTextToSpeech.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTextToSpeech.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTextView.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTextView.java
index 6562d04c1..6562d04c1 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTextView.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTextView.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTime.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTime.java
index 0bf5092ed..0bf5092ed 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTime.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTime.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTimePickerDialog.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTimePickerDialog.java
index 9f309fed3..9f309fed3 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTimePickerDialog.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTimePickerDialog.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowToast.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowToast.java
index 7b1709eb5..7b1709eb5 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowToast.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowToast.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTouchDelegate.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTouchDelegate.java
index b444c18d4..b444c18d4 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTouchDelegate.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTouchDelegate.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTrafficStats.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTrafficStats.java
index 7de1d0723..7de1d0723 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTrafficStats.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTrafficStats.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTypedArray.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTypedArray.java
index 631138659..631138659 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTypedArray.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTypedArray.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTypeface.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTypeface.java
index 78ec79f99..78ec79f99 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowTypeface.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTypeface.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowUserManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowUserManager.java
index 58ac8cbb8..58ac8cbb8 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowUserManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowUserManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowVMRuntime.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowVMRuntime.java
index 97f7538eb..97f7538eb 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowVMRuntime.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowVMRuntime.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowValueAnimator.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowValueAnimator.java
index 9b36713c6..9b36713c6 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowValueAnimator.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowValueAnimator.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowVectorDrawable.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowVectorDrawable.java
index 889518524..889518524 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowVectorDrawable.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowVectorDrawable.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowVelocityTracker.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowVelocityTracker.java
index 86ebbcec2..86ebbcec2 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowVelocityTracker.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowVelocityTracker.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowVideoView.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowVideoView.java
index 157b91236..157b91236 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowVideoView.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowVideoView.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowView.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowView.java
index 762b83233..762b83233 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowView.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowView.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowViewAnimator.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowViewAnimator.java
index 6a30a20f2..6a30a20f2 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowViewAnimator.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowViewAnimator.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowViewConfiguration.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowViewConfiguration.java
index 8babb8984..8babb8984 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowViewConfiguration.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowViewConfiguration.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowViewGroup.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowViewGroup.java
index daa94e9ee..daa94e9ee 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowViewGroup.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowViewGroup.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowViewRootImpl.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowViewRootImpl.java
index e0683a1ce..e0683a1ce 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowViewRootImpl.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowViewRootImpl.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowVirtualRefBasePtr.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowVirtualRefBasePtr.java
index 0a437c3d4..0a437c3d4 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowVirtualRefBasePtr.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowVirtualRefBasePtr.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWallpaperManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWallpaperManager.java
index d9f13f35f..d9f13f35f 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWallpaperManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWallpaperManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWebSyncManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWebSyncManager.java
index bd7a52453..bd7a52453 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWebSyncManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWebSyncManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWebView.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWebView.java
index 95983c323..95983c323 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWebView.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWebView.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWebViewDatabase.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWebViewDatabase.java
index c8b401fe5..c8b401fe5 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWebViewDatabase.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWebViewDatabase.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWifiConfiguration.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWifiConfiguration.java
index 40de630ad..40de630ad 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWifiConfiguration.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWifiConfiguration.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWifiInfo.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWifiInfo.java
index d48b578b6..d48b578b6 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWifiInfo.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWifiInfo.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWifiManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWifiManager.java
index fe7c95d2e..fe7c95d2e 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWifiManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWifiManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWifiP2pGroup.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWifiP2pGroup.java
index f86a7b06e..f86a7b06e 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWifiP2pGroup.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWifiP2pGroup.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWifiP2pManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWifiP2pManager.java
index b785d106e..b785d106e 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWifiP2pManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWifiP2pManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWindow.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWindow.java
index c84e76e8c..c84e76e8c 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWindow.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWindow.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWindowManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWindowManager.java
index cf40fdee5..cf40fdee5 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWindowManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWindowManager.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWindowManagerGlobal.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWindowManagerGlobal.java
index 4ed02847d..4ed02847d 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWindowManagerGlobal.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWindowManagerGlobal.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWindowManagerImpl.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWindowManagerImpl.java
index da0e8138f..da0e8138f 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowWindowManagerImpl.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowWindowManagerImpl.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowZoomButtonsController.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowZoomButtonsController.java
index b24dfa0fc..b24dfa0fc 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowZoomButtonsController.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowZoomButtonsController.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/package-info.java b/shadows/framework/src/main/java/org/robolectric/shadows/package-info.java
index a23bef17b..a23bef17b 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/package-info.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/package-info.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/util/AppSingletonizer.java b/shadows/framework/src/main/java/org/robolectric/shadows/util/AppSingletonizer.java
index 3930d48d8..3930d48d8 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/util/AppSingletonizer.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/util/AppSingletonizer.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/util/DataSource.java b/shadows/framework/src/main/java/org/robolectric/shadows/util/DataSource.java
index f1bcdf93f..f1bcdf93f 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/util/DataSource.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/util/DataSource.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/util/SQLiteLibraryLoader.java b/shadows/framework/src/main/java/org/robolectric/shadows/util/SQLiteLibraryLoader.java
index 163b6d9a2..163b6d9a2 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/util/SQLiteLibraryLoader.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/util/SQLiteLibraryLoader.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/util/package-info.java b/shadows/framework/src/main/java/org/robolectric/shadows/util/package-info.java
index dd7cb8941..dd7cb8941 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/util/package-info.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/util/package-info.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/util/AccessibilityUtil.java b/shadows/framework/src/main/java/org/robolectric/util/AccessibilityUtil.java
index ae3c19e5f..ae3c19e5f 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/util/AccessibilityUtil.java
+++ b/shadows/framework/src/main/java/org/robolectric/util/AccessibilityUtil.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/util/concurrent/RoboExecutorService.java b/shadows/framework/src/main/java/org/robolectric/util/concurrent/RoboExecutorService.java
index 3e6628daf..3e6628daf 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/util/concurrent/RoboExecutorService.java
+++ b/shadows/framework/src/main/java/org/robolectric/util/concurrent/RoboExecutorService.java
diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/util/concurrent/package-info.java b/shadows/framework/src/main/java/org/robolectric/util/concurrent/package-info.java
index 15efe30c0..15efe30c0 100644
--- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/util/concurrent/package-info.java
+++ b/shadows/framework/src/main/java/org/robolectric/util/concurrent/package-info.java
diff --git a/robolectric-shadows/shadows-core/src/main/resources/META-INF/services/org.robolectric.ShadowsAdapter b/shadows/framework/src/main/resources/META-INF/services/org.robolectric.ShadowsAdapter
index d9de5b189..d9de5b189 100644
--- a/robolectric-shadows/shadows-core/src/main/resources/META-INF/services/org.robolectric.ShadowsAdapter
+++ b/shadows/framework/src/main/resources/META-INF/services/org.robolectric.ShadowsAdapter
diff --git a/robolectric-shadows/shadows-httpclient/build.gradle b/shadows/httpclient/build.gradle
index fa0208ce4..9775a1398 100644
--- a/robolectric-shadows/shadows-httpclient/build.gradle
+++ b/shadows/httpclient/build.gradle
@@ -18,7 +18,7 @@ configurations {
 
 dependencies {
     // Project dependencies
-    compileOnly project(":robolectric-shadows/shadows-core")
+    compileOnly project(":shadows/framework")
 
     // Compile dependencies
     earlyRuntime "org.apache.httpcomponents:httpcore:4.0.1"
diff --git a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/ShadowAndroidHttpClient.java b/shadows/httpclient/src/main/java/org/robolectric/shadows/ShadowAndroidHttpClient.java
index edaaa1a5d..edaaa1a5d 100644
--- a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/ShadowAndroidHttpClient.java
+++ b/shadows/httpclient/src/main/java/org/robolectric/shadows/ShadowAndroidHttpClient.java
diff --git a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/DefaultRequestDirector.java b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/DefaultRequestDirector.java
index 631944fdc..631944fdc 100644
--- a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/DefaultRequestDirector.java
+++ b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/DefaultRequestDirector.java
diff --git a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/FakeHttp.java b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/FakeHttp.java
index 111e1e793..111e1e793 100644
--- a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/FakeHttp.java
+++ b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/FakeHttp.java
diff --git a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/FakeHttpLayer.java b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/FakeHttpLayer.java
index b0b649980..b0b649980 100644
--- a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/FakeHttpLayer.java
+++ b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/FakeHttpLayer.java
diff --git a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/HttpEntityStub.java b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/HttpEntityStub.java
index 662765c4e..662765c4e 100644
--- a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/HttpEntityStub.java
+++ b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/HttpEntityStub.java
diff --git a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/HttpRedirect.java b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/HttpRedirect.java
index c345d8215..c345d8215 100644
--- a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/HttpRedirect.java
+++ b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/HttpRedirect.java
diff --git a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/HttpRequestInfo.java b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/HttpRequestInfo.java
index a0b9c80db..a0b9c80db 100644
--- a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/HttpRequestInfo.java
+++ b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/HttpRequestInfo.java
diff --git a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/HttpResponseGenerator.java b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/HttpResponseGenerator.java
index 23405a9e8..23405a9e8 100644
--- a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/HttpResponseGenerator.java
+++ b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/HttpResponseGenerator.java
diff --git a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/HttpResponseStub.java b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/HttpResponseStub.java
index 27eacb929..27eacb929 100644
--- a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/HttpResponseStub.java
+++ b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/HttpResponseStub.java
diff --git a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/ParamsParser.java b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/ParamsParser.java
index 4ed8057e6..4ed8057e6 100644
--- a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/ParamsParser.java
+++ b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/ParamsParser.java
diff --git a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/RequestMatcher.java b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/RequestMatcher.java
index 332a8fa5c..332a8fa5c 100644
--- a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/RequestMatcher.java
+++ b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/RequestMatcher.java
diff --git a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/ShadowDefaultRequestDirector.java b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/ShadowDefaultRequestDirector.java
index 47010cdca..47010cdca 100644
--- a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/ShadowDefaultRequestDirector.java
+++ b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/ShadowDefaultRequestDirector.java
diff --git a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/StatusLineStub.java b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/StatusLineStub.java
index ec978ea85..ec978ea85 100644
--- a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/StatusLineStub.java
+++ b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/StatusLineStub.java
diff --git a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/TestHttpResponse.java b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/TestHttpResponse.java
index 8cc8fa982..8cc8fa982 100644
--- a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/TestHttpResponse.java
+++ b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/TestHttpResponse.java
diff --git a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/package-info.java b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/package-info.java
index b7a71586c..b7a71586c 100644
--- a/robolectric-shadows/shadows-httpclient/src/main/java/org/robolectric/shadows/httpclient/package-info.java
+++ b/shadows/httpclient/src/main/java/org/robolectric/shadows/httpclient/package-info.java
diff --git a/robolectric-shadows/shadows-httpclient/src/test/java/org/robolectric/shadows/httpclient/AndroidHttpClientTest.java b/shadows/httpclient/src/test/java/org/robolectric/shadows/httpclient/AndroidHttpClientTest.java
index 2764f891f..2764f891f 100644
--- a/robolectric-shadows/shadows-httpclient/src/test/java/org/robolectric/shadows/httpclient/AndroidHttpClientTest.java
+++ b/shadows/httpclient/src/test/java/org/robolectric/shadows/httpclient/AndroidHttpClientTest.java
diff --git a/robolectric-shadows/shadows-httpclient/src/test/java/org/robolectric/shadows/httpclient/FakeHttpLayerTest.java b/shadows/httpclient/src/test/java/org/robolectric/shadows/httpclient/FakeHttpLayerTest.java
index 0e437e64f..0e437e64f 100644
--- a/robolectric-shadows/shadows-httpclient/src/test/java/org/robolectric/shadows/httpclient/FakeHttpLayerTest.java
+++ b/shadows/httpclient/src/test/java/org/robolectric/shadows/httpclient/FakeHttpLayerTest.java
diff --git a/robolectric-shadows/shadows-httpclient/src/test/java/org/robolectric/shadows/httpclient/FakeHttpTest.java b/shadows/httpclient/src/test/java/org/robolectric/shadows/httpclient/FakeHttpTest.java
index 5c8c7d571..5c8c7d571 100644
--- a/robolectric-shadows/shadows-httpclient/src/test/java/org/robolectric/shadows/httpclient/FakeHttpTest.java
+++ b/shadows/httpclient/src/test/java/org/robolectric/shadows/httpclient/FakeHttpTest.java
diff --git a/robolectric-shadows/shadows-httpclient/src/test/java/org/robolectric/shadows/httpclient/ParamsParserTest.java b/shadows/httpclient/src/test/java/org/robolectric/shadows/httpclient/ParamsParserTest.java
index 394267c03..394267c03 100644
--- a/robolectric-shadows/shadows-httpclient/src/test/java/org/robolectric/shadows/httpclient/ParamsParserTest.java
+++ b/shadows/httpclient/src/test/java/org/robolectric/shadows/httpclient/ParamsParserTest.java
diff --git a/robolectric-shadows/shadows-httpclient/src/test/java/org/robolectric/shadows/httpclient/ShadowDefaultRequestDirectorTest.java b/shadows/httpclient/src/test/java/org/robolectric/shadows/httpclient/ShadowDefaultRequestDirectorTest.java
index 59fd721fe..59fd721fe 100644
--- a/robolectric-shadows/shadows-httpclient/src/test/java/org/robolectric/shadows/httpclient/ShadowDefaultRequestDirectorTest.java
+++ b/shadows/httpclient/src/test/java/org/robolectric/shadows/httpclient/ShadowDefaultRequestDirectorTest.java
diff --git a/robolectric-shadows/shadows-httpclient/src/test/java/org/robolectric/shadows/httpclient/TestHttpResponseTest.java b/shadows/httpclient/src/test/java/org/robolectric/shadows/httpclient/TestHttpResponseTest.java
index fcd6d5452..fcd6d5452 100644
--- a/robolectric-shadows/shadows-httpclient/src/test/java/org/robolectric/shadows/httpclient/TestHttpResponseTest.java
+++ b/shadows/httpclient/src/test/java/org/robolectric/shadows/httpclient/TestHttpResponseTest.java
diff --git a/robolectric-shadows/shadows-httpclient/src/test/java/org/robolectric/util/TestRunnerWithManifest.java b/shadows/httpclient/src/test/java/org/robolectric/util/TestRunnerWithManifest.java
index 34b5540f0..34b5540f0 100644
--- a/robolectric-shadows/shadows-httpclient/src/test/java/org/robolectric/util/TestRunnerWithManifest.java
+++ b/shadows/httpclient/src/test/java/org/robolectric/util/TestRunnerWithManifest.java
diff --git a/robolectric-shadows/shadows-httpclient/src/test/resources/AndroidManifest.xml b/shadows/httpclient/src/test/resources/AndroidManifest.xml
index b09fe8b9f..b09fe8b9f 100644
--- a/robolectric-shadows/shadows-httpclient/src/test/resources/AndroidManifest.xml
+++ b/shadows/httpclient/src/test/resources/AndroidManifest.xml
diff --git a/robolectric-shadows/shadows-maps/build.gradle b/shadows/maps/build.gradle
index b8b5720eb..081ea7d70 100644
--- a/robolectric-shadows/shadows-maps/build.gradle
+++ b/shadows/maps/build.gradle
@@ -13,7 +13,7 @@ shadows {
 }
 
 dependencies {
-    compileOnly project(":robolectric-shadows/shadows-core")
+    compileOnly project(":shadows/framework")
 
     compileOnly AndroidSdk.MAX_SDK.coordinates
     compile "com.ibm.icu:icu4j:53.1"
diff --git a/robolectric-shadows/shadows-maps/src/main/java/com/google/android/maps/ShadowItemizedOverlayBridge.java b/shadows/maps/src/main/java/com/google/android/maps/ShadowItemizedOverlayBridge.java
index 5f0247eb1..5f0247eb1 100644
--- a/robolectric-shadows/shadows-maps/src/main/java/com/google/android/maps/ShadowItemizedOverlayBridge.java
+++ b/shadows/maps/src/main/java/com/google/android/maps/ShadowItemizedOverlayBridge.java
diff --git a/robolectric-shadows/shadows-maps/src/main/java/org/robolectric/shadows/maps/ShadowGeoPoint.java b/shadows/maps/src/main/java/org/robolectric/shadows/maps/ShadowGeoPoint.java
index 3306a0b88..3306a0b88 100644
--- a/robolectric-shadows/shadows-maps/src/main/java/org/robolectric/shadows/maps/ShadowGeoPoint.java
+++ b/shadows/maps/src/main/java/org/robolectric/shadows/maps/ShadowGeoPoint.java
diff --git a/robolectric-shadows/shadows-maps/src/main/java/org/robolectric/shadows/maps/ShadowGeocoder.java b/shadows/maps/src/main/java/org/robolectric/shadows/maps/ShadowGeocoder.java
index ce4eea140..ce4eea140 100644
--- a/robolectric-shadows/shadows-maps/src/main/java/org/robolectric/shadows/maps/ShadowGeocoder.java
+++ b/shadows/maps/src/main/java/org/robolectric/shadows/maps/ShadowGeocoder.java
diff --git a/robolectric-shadows/shadows-maps/src/main/java/org/robolectric/shadows/maps/ShadowItemizedOverlay.java b/shadows/maps/src/main/java/org/robolectric/shadows/maps/ShadowItemizedOverlay.java
index 4008156b8..4008156b8 100644
--- a/robolectric-shadows/shadows-maps/src/main/java/org/robolectric/shadows/maps/ShadowItemizedOverlay.java
+++ b/shadows/maps/src/main/java/org/robolectric/shadows/maps/ShadowItemizedOverlay.java
diff --git a/robolectric-shadows/shadows-maps/src/main/java/org/robolectric/shadows/maps/ShadowMapActivity.java b/shadows/maps/src/main/java/org/robolectric/shadows/maps/ShadowMapActivity.java
index 481eddb89..481eddb89 100644
--- a/robolectric-shadows/shadows-maps/src/main/java/org/robolectric/shadows/maps/ShadowMapActivity.java
+++ b/shadows/maps/src/main/java/org/robolectric/shadows/maps/ShadowMapActivity.java
diff --git a/robolectric-shadows/shadows-maps/src/main/java/org/robolectric/shadows/maps/ShadowMapController.java b/shadows/maps/src/main/java/org/robolectric/shadows/maps/ShadowMapController.java
index a339157fe..a339157fe 100644
--- a/robolectric-shadows/shadows-maps/src/main/java/org/robolectric/shadows/maps/ShadowMapController.java
+++ b/shadows/maps/src/main/java/org/robolectric/shadows/maps/ShadowMapController.java
diff --git a/robolectric-shadows/shadows-maps/src/main/java/org/robolectric/shadows/maps/ShadowMapView.java b/shadows/maps/src/main/java/org/robolectric/shadows/maps/ShadowMapView.java
index c985b854a..c985b854a 100644
--- a/robolectric-shadows/shadows-maps/src/main/java/org/robolectric/shadows/maps/ShadowMapView.java
+++ b/shadows/maps/src/main/java/org/robolectric/shadows/maps/ShadowMapView.java
diff --git a/robolectric-shadows/shadows-maps/src/main/java/org/robolectric/shadows/maps/ShadowOverlayItem.java b/shadows/maps/src/main/java/org/robolectric/shadows/maps/ShadowOverlayItem.java
index 0b36c3098..0b36c3098 100644
--- a/robolectric-shadows/shadows-maps/src/main/java/org/robolectric/shadows/maps/ShadowOverlayItem.java
+++ b/shadows/maps/src/main/java/org/robolectric/shadows/maps/ShadowOverlayItem.java
diff --git a/robolectric-shadows/shadows-maps/src/main/java/org/robolectric/shadows/maps/package-info.java b/shadows/maps/src/main/java/org/robolectric/shadows/maps/package-info.java
index bb27c6702..bb27c6702 100644
--- a/robolectric-shadows/shadows-maps/src/main/java/org/robolectric/shadows/maps/package-info.java
+++ b/shadows/maps/src/main/java/org/robolectric/shadows/maps/package-info.java
diff --git a/robolectric-shadows/shadows-maps/src/test/java/org/robolectric/shadows/maps/ShadowGeocoderTest.java b/shadows/maps/src/test/java/org/robolectric/shadows/maps/ShadowGeocoderTest.java
index ab52131f5..ab52131f5 100644
--- a/robolectric-shadows/shadows-maps/src/test/java/org/robolectric/shadows/maps/ShadowGeocoderTest.java
+++ b/shadows/maps/src/test/java/org/robolectric/shadows/maps/ShadowGeocoderTest.java
diff --git a/robolectric-shadows/shadows-maps/src/test/java/org/robolectric/shadows/maps/ShadowItemizedOverlayTest.java b/shadows/maps/src/test/java/org/robolectric/shadows/maps/ShadowItemizedOverlayTest.java
index 3471afdba..3471afdba 100644
--- a/robolectric-shadows/shadows-maps/src/test/java/org/robolectric/shadows/maps/ShadowItemizedOverlayTest.java
+++ b/shadows/maps/src/test/java/org/robolectric/shadows/maps/ShadowItemizedOverlayTest.java
diff --git a/robolectric-shadows/shadows-maps/src/test/java/org/robolectric/shadows/maps/ShadowMapViewTest.java b/shadows/maps/src/test/java/org/robolectric/shadows/maps/ShadowMapViewTest.java
index 2cd6c408d..2cd6c408d 100644
--- a/robolectric-shadows/shadows-maps/src/test/java/org/robolectric/shadows/maps/ShadowMapViewTest.java
+++ b/shadows/maps/src/test/java/org/robolectric/shadows/maps/ShadowMapViewTest.java
diff --git a/robolectric-shadows/shadows-maps/src/test/java/org/robolectric/util/TestRunnerWithManifest.java b/shadows/maps/src/test/java/org/robolectric/util/TestRunnerWithManifest.java
index 99d7d1251..99d7d1251 100644
--- a/robolectric-shadows/shadows-maps/src/test/java/org/robolectric/util/TestRunnerWithManifest.java
+++ b/shadows/maps/src/test/java/org/robolectric/util/TestRunnerWithManifest.java
diff --git a/robolectric-shadows/shadows-maps/src/test/resources/AndroidManifest.xml b/shadows/maps/src/test/resources/AndroidManifest.xml
index 62f16a4f9..62f16a4f9 100644
--- a/robolectric-shadows/shadows-maps/src/test/resources/AndroidManifest.xml
+++ b/shadows/maps/src/test/resources/AndroidManifest.xml
diff --git a/robolectric-shadows/shadows-multidex/build.gradle b/shadows/multidex/build.gradle
index 8b58bbd33..bde3054d0 100644
--- a/robolectric-shadows/shadows-multidex/build.gradle
+++ b/shadows/multidex/build.gradle
@@ -13,7 +13,7 @@ shadows {
 }
 
 dependencies {
-    compileOnly project(":robolectric-shadows/shadows-core")
+    compileOnly project(":shadows/framework")
 
     compileOnly "com.android.support:multidex:1.0.1"
 
diff --git a/robolectric-shadows/shadows-multidex/src/main/java/org/robolectric/shadows/multidex/ShadowMultiDex.java b/shadows/multidex/src/main/java/org/robolectric/shadows/multidex/ShadowMultiDex.java
index 81257821a..81257821a 100644
--- a/robolectric-shadows/shadows-multidex/src/main/java/org/robolectric/shadows/multidex/ShadowMultiDex.java
+++ b/shadows/multidex/src/main/java/org/robolectric/shadows/multidex/ShadowMultiDex.java
diff --git a/robolectric-shadows/shadows-multidex/src/main/java/org/robolectric/shadows/multidex/package-info.java b/shadows/multidex/src/main/java/org/robolectric/shadows/multidex/package-info.java
index 969b789da..969b789da 100644
--- a/robolectric-shadows/shadows-multidex/src/main/java/org/robolectric/shadows/multidex/package-info.java
+++ b/shadows/multidex/src/main/java/org/robolectric/shadows/multidex/package-info.java
diff --git a/robolectric-shadows/shadows-play-services/build.gradle b/shadows/playservices/build.gradle
index 0eaf5d38f..ccdbb3620 100644
--- a/robolectric-shadows/shadows-play-services/build.gradle
+++ b/shadows/playservices/build.gradle
@@ -13,7 +13,7 @@ shadows {
 }
 
 dependencies {
-    compileOnly project(":robolectric-shadows/shadows-core")
+    compileOnly project(":shadows/framework")
 
     compileOnly "com.android.support:support-fragment:26.0.0-alpha1"
     compileOnly "com.google.android.gms:play-services-base:8.4.0"
diff --git a/robolectric-shadows/shadows-play-services/src/main/java/org/robolectric/shadows/gms/ShadowGoogleAuthUtil.java b/shadows/playservices/src/main/java/org/robolectric/shadows/gms/ShadowGoogleAuthUtil.java
index 42dc259e5..42dc259e5 100644
--- a/robolectric-shadows/shadows-play-services/src/main/java/org/robolectric/shadows/gms/ShadowGoogleAuthUtil.java
+++ b/shadows/playservices/src/main/java/org/robolectric/shadows/gms/ShadowGoogleAuthUtil.java
diff --git a/robolectric-shadows/shadows-play-services/src/main/java/org/robolectric/shadows/gms/ShadowGooglePlayServicesUtil.java b/shadows/playservices/src/main/java/org/robolectric/shadows/gms/ShadowGooglePlayServicesUtil.java
index b709a9f24..b709a9f24 100644
--- a/robolectric-shadows/shadows-play-services/src/main/java/org/robolectric/shadows/gms/ShadowGooglePlayServicesUtil.java
+++ b/shadows/playservices/src/main/java/org/robolectric/shadows/gms/ShadowGooglePlayServicesUtil.java
diff --git a/robolectric-shadows/shadows-play-services/src/main/java/org/robolectric/shadows/gms/common/ShadowGoogleApiAvailability.java b/shadows/playservices/src/main/java/org/robolectric/shadows/gms/common/ShadowGoogleApiAvailability.java
index ee19143f3..ee19143f3 100644
--- a/robolectric-shadows/shadows-play-services/src/main/java/org/robolectric/shadows/gms/common/ShadowGoogleApiAvailability.java
+++ b/shadows/playservices/src/main/java/org/robolectric/shadows/gms/common/ShadowGoogleApiAvailability.java
diff --git a/robolectric-shadows/shadows-play-services/src/main/java/org/robolectric/shadows/gms/package-info.java b/shadows/playservices/src/main/java/org/robolectric/shadows/gms/package-info.java
index 623837d6a..623837d6a 100644
--- a/robolectric-shadows/shadows-play-services/src/main/java/org/robolectric/shadows/gms/package-info.java
+++ b/shadows/playservices/src/main/java/org/robolectric/shadows/gms/package-info.java
diff --git a/robolectric-shadows/shadows-play-services/src/test/java/org/robolectric/shadows/gms/ShadowGoogleAuthUtilTest.java b/shadows/playservices/src/test/java/org/robolectric/shadows/gms/ShadowGoogleAuthUtilTest.java
index ca566c5d1..ca566c5d1 100644
--- a/robolectric-shadows/shadows-play-services/src/test/java/org/robolectric/shadows/gms/ShadowGoogleAuthUtilTest.java
+++ b/shadows/playservices/src/test/java/org/robolectric/shadows/gms/ShadowGoogleAuthUtilTest.java
diff --git a/robolectric-shadows/shadows-play-services/src/test/java/org/robolectric/shadows/gms/ShadowGooglePlayServicesUtilTest.java b/shadows/playservices/src/test/java/org/robolectric/shadows/gms/ShadowGooglePlayServicesUtilTest.java
index a42347219..a42347219 100644
--- a/robolectric-shadows/shadows-play-services/src/test/java/org/robolectric/shadows/gms/ShadowGooglePlayServicesUtilTest.java
+++ b/shadows/playservices/src/test/java/org/robolectric/shadows/gms/ShadowGooglePlayServicesUtilTest.java
diff --git a/robolectric-shadows/shadows-play-services/src/test/java/org/robolectric/shadows/gms/common/ShadowGoogleApiAvailabilityTest.java b/shadows/playservices/src/test/java/org/robolectric/shadows/gms/common/ShadowGoogleApiAvailabilityTest.java
index 0a8d4d842..0a8d4d842 100644
--- a/robolectric-shadows/shadows-play-services/src/test/java/org/robolectric/shadows/gms/common/ShadowGoogleApiAvailabilityTest.java
+++ b/shadows/playservices/src/test/java/org/robolectric/shadows/gms/common/ShadowGoogleApiAvailabilityTest.java
diff --git a/robolectric-shadows/shadows-support-v4/build.gradle b/shadows/supportv4/build.gradle
index 34bc5aeb8..7b8a6c642 100644
--- a/robolectric-shadows/shadows-support-v4/build.gradle
+++ b/shadows/supportv4/build.gradle
@@ -19,7 +19,7 @@ configurations {
 dependencies {
     // Project dependencies
     compileOnly project(":robolectric")
-    compileOnly project(":robolectric-shadows/shadows-core")
+    compileOnly project(":shadows/framework")
 
     // Compile dependencies
     compileOnly AndroidSdk.MAX_SDK.coordinates
diff --git a/robolectric-shadows/shadows-support-v4/src/main/java/org/robolectric/shadows/support/v4/ShadowAsyncTaskLoader.java b/shadows/supportv4/src/main/java/org/robolectric/shadows/support/v4/ShadowAsyncTaskLoader.java
index 1041822f7..1041822f7 100644
--- a/robolectric-shadows/shadows-support-v4/src/main/java/org/robolectric/shadows/support/v4/ShadowAsyncTaskLoader.java
+++ b/shadows/supportv4/src/main/java/org/robolectric/shadows/support/v4/ShadowAsyncTaskLoader.java
diff --git a/robolectric-shadows/shadows-support-v4/src/main/java/org/robolectric/shadows/support/v4/ShadowCursorLoader.java b/shadows/supportv4/src/main/java/org/robolectric/shadows/support/v4/ShadowCursorLoader.java
index 275f215d8..275f215d8 100644
--- a/robolectric-shadows/shadows-support-v4/src/main/java/org/robolectric/shadows/support/v4/ShadowCursorLoader.java
+++ b/shadows/supportv4/src/main/java/org/robolectric/shadows/support/v4/ShadowCursorLoader.java
diff --git a/robolectric-shadows/shadows-support-v4/src/main/java/org/robolectric/shadows/support/v4/ShadowDrawerLayout.java b/shadows/supportv4/src/main/java/org/robolectric/shadows/support/v4/ShadowDrawerLayout.java
index 31812f8ec..31812f8ec 100644
--- a/robolectric-shadows/shadows-support-v4/src/main/java/org/robolectric/shadows/support/v4/ShadowDrawerLayout.java
+++ b/shadows/supportv4/src/main/java/org/robolectric/shadows/support/v4/ShadowDrawerLayout.java
diff --git a/robolectric-shadows/shadows-support-v4/src/main/java/org/robolectric/shadows/support/v4/ShadowLocalBroadcastManager.java b/shadows/supportv4/src/main/java/org/robolectric/shadows/support/v4/ShadowLocalBroadcastManager.java
index 942309189..942309189 100644
--- a/robolectric-shadows/shadows-support-v4/src/main/java/org/robolectric/shadows/support/v4/ShadowLocalBroadcastManager.java
+++ b/shadows/supportv4/src/main/java/org/robolectric/shadows/support/v4/ShadowLocalBroadcastManager.java
diff --git a/robolectric-shadows/shadows-support-v4/src/main/java/org/robolectric/shadows/support/v4/ShadowSwipeRefreshLayout.java b/shadows/supportv4/src/main/java/org/robolectric/shadows/support/v4/ShadowSwipeRefreshLayout.java
index 2760d48b6..2760d48b6 100644
--- a/robolectric-shadows/shadows-support-v4/src/main/java/org/robolectric/shadows/support/v4/ShadowSwipeRefreshLayout.java
+++ b/shadows/supportv4/src/main/java/org/robolectric/shadows/support/v4/ShadowSwipeRefreshLayout.java
diff --git a/robolectric-shadows/shadows-support-v4/src/main/java/org/robolectric/shadows/support/v4/SupportFragmentController.java b/shadows/supportv4/src/main/java/org/robolectric/shadows/support/v4/SupportFragmentController.java
index 25ea4263d..25ea4263d 100644
--- a/robolectric-shadows/shadows-support-v4/src/main/java/org/robolectric/shadows/support/v4/SupportFragmentController.java
+++ b/shadows/supportv4/src/main/java/org/robolectric/shadows/support/v4/SupportFragmentController.java
diff --git a/robolectric-shadows/shadows-support-v4/src/main/java/org/robolectric/shadows/support/v4/SupportFragmentTestUtil.java b/shadows/supportv4/src/main/java/org/robolectric/shadows/support/v4/SupportFragmentTestUtil.java
index e8b1fd308..e8b1fd308 100644
--- a/robolectric-shadows/shadows-support-v4/src/main/java/org/robolectric/shadows/support/v4/SupportFragmentTestUtil.java
+++ b/shadows/supportv4/src/main/java/org/robolectric/shadows/support/v4/SupportFragmentTestUtil.java
diff --git a/robolectric-shadows/shadows-support-v4/src/main/java/org/robolectric/shadows/support/v4/package-info.java b/shadows/supportv4/src/main/java/org/robolectric/shadows/support/v4/package-info.java
index a5f81a721..a5f81a721 100644
--- a/robolectric-shadows/shadows-support-v4/src/main/java/org/robolectric/shadows/support/v4/package-info.java
+++ b/shadows/supportv4/src/main/java/org/robolectric/shadows/support/v4/package-info.java
diff --git a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/R.java b/shadows/supportv4/src/test/java/org/robolectric/R.java
index a8245eab6..a8245eab6 100644
--- a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/R.java
+++ b/shadows/supportv4/src/test/java/org/robolectric/R.java
diff --git a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/android/AccessibilityUtilTest.java b/shadows/supportv4/src/test/java/org/robolectric/android/AccessibilityUtilTest.java
index a193b705d..a193b705d 100644
--- a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/android/AccessibilityUtilTest.java
+++ b/shadows/supportv4/src/test/java/org/robolectric/android/AccessibilityUtilTest.java
diff --git a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/BuildCompatTest.java b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/BuildCompatTest.java
index b2072ee0e..b2072ee0e 100644
--- a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/BuildCompatTest.java
+++ b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/BuildCompatTest.java
diff --git a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/NotificationCompatBuilderTest.java b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/NotificationCompatBuilderTest.java
index 0c6bf186d..0c6bf186d 100644
--- a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/NotificationCompatBuilderTest.java
+++ b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/NotificationCompatBuilderTest.java
diff --git a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/ShadowAsyncTaskLoaderTest.java b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/ShadowAsyncTaskLoaderTest.java
index 6bd2748f4..6bd2748f4 100644
--- a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/ShadowAsyncTaskLoaderTest.java
+++ b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/ShadowAsyncTaskLoaderTest.java
diff --git a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/ShadowCursorLoaderTest.java b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/ShadowCursorLoaderTest.java
index 5b1407ec3..5b1407ec3 100644
--- a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/ShadowCursorLoaderTest.java
+++ b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/ShadowCursorLoaderTest.java
diff --git a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/ShadowDialogFragmentTest.java b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/ShadowDialogFragmentTest.java
index 1d80d89d4..1d80d89d4 100644
--- a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/ShadowDialogFragmentTest.java
+++ b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/ShadowDialogFragmentTest.java
diff --git a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/ShadowDrawerLayoutTest.java b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/ShadowDrawerLayoutTest.java
index 18d58408c..18d58408c 100644
--- a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/ShadowDrawerLayoutTest.java
+++ b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/ShadowDrawerLayoutTest.java
diff --git a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/ShadowLoaderTest.java b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/ShadowLoaderTest.java
index 28f560e54..28f560e54 100644
--- a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/ShadowLoaderTest.java
+++ b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/ShadowLoaderTest.java
diff --git a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/ShadowLocalBroadcastManagerTest.java b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/ShadowLocalBroadcastManagerTest.java
index 5282360fb..5282360fb 100644
--- a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/ShadowLocalBroadcastManagerTest.java
+++ b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/ShadowLocalBroadcastManagerTest.java
diff --git a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/ShadowPagerAdapterTest.java b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/ShadowPagerAdapterTest.java
index 05aff384c..05aff384c 100644
--- a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/ShadowPagerAdapterTest.java
+++ b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/ShadowPagerAdapterTest.java
diff --git a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/ShadowSwipeRefreshLayoutTest.java b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/ShadowSwipeRefreshLayoutTest.java
index ef0f9ad36..ef0f9ad36 100644
--- a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/ShadowSwipeRefreshLayoutTest.java
+++ b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/ShadowSwipeRefreshLayoutTest.java
diff --git a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/ShadowViewPagerTest.java b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/ShadowViewPagerTest.java
index 4bab4bfb6..4bab4bfb6 100644
--- a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/ShadowViewPagerTest.java
+++ b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/ShadowViewPagerTest.java
diff --git a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/SupportFragmentControllerTest.java b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/SupportFragmentControllerTest.java
index cd391b11b..cd391b11b 100644
--- a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/SupportFragmentControllerTest.java
+++ b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/SupportFragmentControllerTest.java
diff --git a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/SupportFragmentTestUtilTest.java b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/SupportFragmentTestUtilTest.java
index 07069f96b..07069f96b 100644
--- a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/shadows/support/v4/SupportFragmentTestUtilTest.java
+++ b/shadows/supportv4/src/test/java/org/robolectric/shadows/support/v4/SupportFragmentTestUtilTest.java
diff --git a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/util/TestRunnerWithManifest.java b/shadows/supportv4/src/test/java/org/robolectric/util/TestRunnerWithManifest.java
index 18b6b3a26..18b6b3a26 100644
--- a/robolectric-shadows/shadows-support-v4/src/test/java/org/robolectric/util/TestRunnerWithManifest.java
+++ b/shadows/supportv4/src/test/java/org/robolectric/util/TestRunnerWithManifest.java
diff --git a/robolectric-shadows/shadows-support-v4/src/test/resources/AndroidManifest.xml b/shadows/supportv4/src/test/resources/AndroidManifest.xml
index fe15d6cd6..fe15d6cd6 100644
--- a/robolectric-shadows/shadows-support-v4/src/test/resources/AndroidManifest.xml
+++ b/shadows/supportv4/src/test/resources/AndroidManifest.xml
diff --git a/robolectric-shadows/shadows-support-v4/src/test/resources/res/layout/dialog_fragment.xml b/shadows/supportv4/src/test/resources/res/layout/dialog_fragment.xml
index d7785754e..d7785754e 100644
--- a/robolectric-shadows/shadows-support-v4/src/test/resources/res/layout/dialog_fragment.xml
+++ b/shadows/supportv4/src/test/resources/res/layout/dialog_fragment.xml
diff --git a/robolectric-shadows/shadows-support-v4/src/test/resources/res/layout/fragment_contents.xml b/shadows/supportv4/src/test/resources/res/layout/fragment_contents.xml
index 425b2bb6a..425b2bb6a 100644
--- a/robolectric-shadows/shadows-support-v4/src/test/resources/res/layout/fragment_contents.xml
+++ b/shadows/supportv4/src/test/resources/res/layout/fragment_contents.xml
diff --git a/robolectric-utils/build.gradle b/utils/build.gradle
index 7b0363f28..80c58940a 100644
--- a/robolectric-utils/build.gradle
+++ b/utils/build.gradle
@@ -8,7 +8,7 @@ new RoboJavaModulePlugin(
 
 dependencies {
     // Compile dependencies
-    compile project(":robolectric-annotations")
+    compile project(":annotations")
 
     // Testing dependencies
     testCompile "junit:junit:4.12"
diff --git a/robolectric-utils/src/main/java/org/robolectric/util/Join.java b/utils/src/main/java/org/robolectric/util/Join.java
index a2abb42c7..a2abb42c7 100644
--- a/robolectric-utils/src/main/java/org/robolectric/util/Join.java
+++ b/utils/src/main/java/org/robolectric/util/Join.java
diff --git a/robolectric-utils/src/main/java/org/robolectric/util/Logger.java b/utils/src/main/java/org/robolectric/util/Logger.java
index 3aef1e90d..3aef1e90d 100644
--- a/robolectric-utils/src/main/java/org/robolectric/util/Logger.java
+++ b/utils/src/main/java/org/robolectric/util/Logger.java
diff --git a/robolectric-utils/src/main/java/org/robolectric/util/NamedStream.java b/utils/src/main/java/org/robolectric/util/NamedStream.java
index 6d7e470aa..6d7e470aa 100644
--- a/robolectric-utils/src/main/java/org/robolectric/util/NamedStream.java
+++ b/utils/src/main/java/org/robolectric/util/NamedStream.java
diff --git a/robolectric-utils/src/main/java/org/robolectric/util/Pair.java b/utils/src/main/java/org/robolectric/util/Pair.java
index 53586fcc7..53586fcc7 100644
--- a/robolectric-utils/src/main/java/org/robolectric/util/Pair.java
+++ b/utils/src/main/java/org/robolectric/util/Pair.java
diff --git a/robolectric-utils/src/main/java/org/robolectric/util/Scheduler.java b/utils/src/main/java/org/robolectric/util/Scheduler.java
index fc7fc0f09..fc7fc0f09 100644
--- a/robolectric-utils/src/main/java/org/robolectric/util/Scheduler.java
+++ b/utils/src/main/java/org/robolectric/util/Scheduler.java
diff --git a/robolectric-utils/src/main/java/org/robolectric/util/SimpleFuture.java b/utils/src/main/java/org/robolectric/util/SimpleFuture.java
index c5c72775a..c5c72775a 100644
--- a/robolectric-utils/src/main/java/org/robolectric/util/SimpleFuture.java
+++ b/utils/src/main/java/org/robolectric/util/SimpleFuture.java
diff --git a/robolectric-utils/src/main/java/org/robolectric/util/SoftThreadLocal.java b/utils/src/main/java/org/robolectric/util/SoftThreadLocal.java
index 02478c99f..02478c99f 100644
--- a/robolectric-utils/src/main/java/org/robolectric/util/SoftThreadLocal.java
+++ b/utils/src/main/java/org/robolectric/util/SoftThreadLocal.java
diff --git a/robolectric-utils/src/main/java/org/robolectric/util/Strftime.java b/utils/src/main/java/org/robolectric/util/Strftime.java
index 4408c30fa..4408c30fa 100644
--- a/robolectric-utils/src/main/java/org/robolectric/util/Strftime.java
+++ b/utils/src/main/java/org/robolectric/util/Strftime.java
diff --git a/robolectric-utils/src/main/java/org/robolectric/util/Strings.java b/utils/src/main/java/org/robolectric/util/Strings.java
index 026176315..026176315 100644
--- a/robolectric-utils/src/main/java/org/robolectric/util/Strings.java
+++ b/utils/src/main/java/org/robolectric/util/Strings.java
diff --git a/robolectric-utils/src/main/java/org/robolectric/util/TempDirectory.java b/utils/src/main/java/org/robolectric/util/TempDirectory.java
index e5c001f12..e5c001f12 100644
--- a/robolectric-utils/src/main/java/org/robolectric/util/TempDirectory.java
+++ b/utils/src/main/java/org/robolectric/util/TempDirectory.java
diff --git a/robolectric-utils/src/main/java/org/robolectric/util/TestRunnable.java b/utils/src/main/java/org/robolectric/util/TestRunnable.java
index 1d782b06f..1d782b06f 100644
--- a/robolectric-utils/src/main/java/org/robolectric/util/TestRunnable.java
+++ b/utils/src/main/java/org/robolectric/util/TestRunnable.java
diff --git a/robolectric-utils/src/main/java/org/robolectric/util/TimeUtils.java b/utils/src/main/java/org/robolectric/util/TimeUtils.java
index ff7b1abdd..ff7b1abdd 100644
--- a/robolectric-utils/src/main/java/org/robolectric/util/TimeUtils.java
+++ b/utils/src/main/java/org/robolectric/util/TimeUtils.java
diff --git a/robolectric-utils/src/main/java/org/robolectric/util/Util.java b/utils/src/main/java/org/robolectric/util/Util.java
index 80dc58f68..80dc58f68 100644
--- a/robolectric-utils/src/main/java/org/robolectric/util/Util.java
+++ b/utils/src/main/java/org/robolectric/util/Util.java
diff --git a/robolectric-utils/src/main/java/org/robolectric/util/package-info.java b/utils/src/main/java/org/robolectric/util/package-info.java
index e95b6b1f4..e95b6b1f4 100644
--- a/robolectric-utils/src/main/java/org/robolectric/util/package-info.java
+++ b/utils/src/main/java/org/robolectric/util/package-info.java
diff --git a/robolectric-utils/src/test/java/org/robolectric/util/SchedulerTest.java b/utils/src/test/java/org/robolectric/util/SchedulerTest.java
index dabb04a3a..dabb04a3a 100644
--- a/robolectric-utils/src/test/java/org/robolectric/util/SchedulerTest.java
+++ b/utils/src/test/java/org/robolectric/util/SchedulerTest.java
diff --git a/robolectric-utils/src/test/java/org/robolectric/util/StringsTest.java b/utils/src/test/java/org/robolectric/util/StringsTest.java
index 75cc58fd7..75cc58fd7 100644
--- a/robolectric-utils/src/test/java/org/robolectric/util/StringsTest.java
+++ b/utils/src/test/java/org/robolectric/util/StringsTest.java
diff --git a/robolectric-utils/src/test/java/org/robolectric/util/TempDirectoryTest.java b/utils/src/test/java/org/robolectric/util/TempDirectoryTest.java
index 5472462f3..5472462f3 100644
--- a/robolectric-utils/src/test/java/org/robolectric/util/TempDirectoryTest.java
+++ b/utils/src/test/java/org/robolectric/util/TempDirectoryTest.java