Fix more imports.
diff --git a/integration_tests/dependency-on-stubs/src/test/java/org/robolectric/LoadWeirdClassesTest.java b/integration_tests/dependency-on-stubs/src/test/java/org/robolectric/LoadWeirdClassesTest.java
index 4d4fefe..026c10c 100644
--- a/integration_tests/dependency-on-stubs/src/test/java/org/robolectric/LoadWeirdClassesTest.java
+++ b/integration_tests/dependency-on-stubs/src/test/java/org/robolectric/LoadWeirdClassesTest.java
@@ -1,5 +1,8 @@
package org.robolectric;
+import static android.os.Build.VERSION_CODES.KITKAT;
+import static org.robolectric.Shadows.shadowOf;
+
import android.app.Activity;
import android.content.Context;
import android.os.Build;
@@ -10,9 +13,6 @@
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import static android.os.Build.VERSION_CODES.KITKAT;
-import static org.robolectric.Shadows.shadowOf;
-
@RunWith(RobolectricTestRunner.class) @Config(sdk = Config.ALL_SDKS)
public class LoadWeirdClassesTest {
@Test @Config(sdk = KITKAT)
diff --git a/integration_tests/libphonenumber/src/test/java/org/robolectric/integration_tests/libphonenumber/ClassloadingTest.java b/integration_tests/libphonenumber/src/test/java/org/robolectric/integration_tests/libphonenumber/ClassloadingTest.java
index 57b367e..db1e0b3 100644
--- a/integration_tests/libphonenumber/src/test/java/org/robolectric/integration_tests/libphonenumber/ClassloadingTest.java
+++ b/integration_tests/libphonenumber/src/test/java/org/robolectric/integration_tests/libphonenumber/ClassloadingTest.java
@@ -1,5 +1,7 @@
package org.robolectric.integration_tests.libphonenumber;
+import static org.assertj.core.api.Assertions.assertThat;
+
import com.google.i18n.phonenumbers.PhoneNumberUtil;
import com.google.i18n.phonenumbers.Phonenumber;
import org.junit.Test;
@@ -7,8 +9,6 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
-import static org.assertj.core.api.Assertions.assertThat;
-
@RunWith(RobolectricTestRunner.class)
@Config(sdk = Config.ALL_SDKS )
public class ClassloadingTest {
diff --git a/integration_tests/mockito-experimental/src/test/java/org/robolectric/integration_tests/mockito_experimental/MockitoMockFinalsTest.java b/integration_tests/mockito-experimental/src/test/java/org/robolectric/integration_tests/mockito_experimental/MockitoMockFinalsTest.java
index 1486fc6..08acdaf 100644
--- a/integration_tests/mockito-experimental/src/test/java/org/robolectric/integration_tests/mockito_experimental/MockitoMockFinalsTest.java
+++ b/integration_tests/mockito-experimental/src/test/java/org/robolectric/integration_tests/mockito_experimental/MockitoMockFinalsTest.java
@@ -1,5 +1,9 @@
package org.robolectric.integration_tests.mockito_experimental;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
import android.text.Layout;
import android.widget.TextView;
import org.junit.Rule;
@@ -10,10 +14,6 @@
import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
@RunWith(RobolectricTestRunner.class)
public class MockitoMockFinalsTest {
@Rule
diff --git a/integration_tests/powermock/src/test/java/org/robolectric/integration_tests/mockito/PowerMockStaticTest.java b/integration_tests/powermock/src/test/java/org/robolectric/integration_tests/mockito/PowerMockStaticTest.java
index ca1f60f..21cff8b 100644
--- a/integration_tests/powermock/src/test/java/org/robolectric/integration_tests/mockito/PowerMockStaticTest.java
+++ b/integration_tests/powermock/src/test/java/org/robolectric/integration_tests/mockito/PowerMockStaticTest.java
@@ -1,5 +1,7 @@
package org.robolectric.integration_tests.mockito;
+import static org.assertj.core.api.Assertions.assertThat;
+
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -10,8 +12,6 @@
import org.powermock.modules.junit4.rule.PowerMockRule;
import org.robolectric.RobolectricTestRunner;
-import static org.assertj.core.api.Assertions.assertThat;
-
@RunWith(RobolectricTestRunner.class)
@PowerMockIgnore({"org.mockito.*", "org.robolectric.*", "android.*"})
@PrepareForTest(PowerMockStaticTest.Static.class)
diff --git a/robolectric/src/test/java/org/robolectric/shadows/SQLiteCursorTest.java b/robolectric/src/test/java/org/robolectric/shadows/SQLiteCursorTest.java
index 1f296b8..de717dd 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/SQLiteCursorTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/SQLiteCursorTest.java
@@ -1,6 +1,5 @@
package org.robolectric.shadows;
-
import static org.assertj.core.api.Assertions.assertThat;
import android.database.Cursor;
diff --git a/robolectric/src/test/java/org/robolectric/shadows/SQLiteQueryBuilderTest.java b/robolectric/src/test/java/org/robolectric/shadows/SQLiteQueryBuilderTest.java
index c283a8c..e874603 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/SQLiteQueryBuilderTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/SQLiteQueryBuilderTest.java
@@ -1,6 +1,5 @@
package org.robolectric.shadows;
-
import static org.assertj.core.api.Assertions.assertThat;
import android.content.ContentValues;
diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowBluetoothAdapterTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowBluetoothAdapterTest.java
index 4aca4a4..ada77be 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/ShadowBluetoothAdapterTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowBluetoothAdapterTest.java
@@ -1,6 +1,5 @@
package org.robolectric.shadows;
-
import static android.os.Build.VERSION_CODES.JELLY_BEAN_MR2;
import static org.assertj.core.api.Assertions.assertThat;
import static org.robolectric.Shadows.shadowOf;
diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowCameraParametersTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowCameraParametersTest.java
index 308ab58..aefbf8c 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/ShadowCameraParametersTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowCameraParametersTest.java
@@ -1,6 +1,5 @@
package org.robolectric.shadows;
-
import static org.assertj.core.api.Assertions.assertThat;
import android.graphics.ImageFormat;
diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowCameraSizeTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowCameraSizeTest.java
index d189645..b4b90c3 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/ShadowCameraSizeTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowCameraSizeTest.java
@@ -1,6 +1,5 @@
package org.robolectric.shadows;
-
import static org.assertj.core.api.Assertions.assertThat;
import android.hardware.Camera;
diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowConfigurationTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowConfigurationTest.java
index 79f3e4d..4bce914 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/ShadowConfigurationTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowConfigurationTest.java
@@ -1,6 +1,5 @@
package org.robolectric.shadows;
-
import static android.content.res.Configuration.SCREENLAYOUT_UNDEFINED;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowCornerPathEffectTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowCornerPathEffectTest.java
index 1a51a4d..479346a 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/ShadowCornerPathEffectTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowCornerPathEffectTest.java
@@ -8,7 +8,6 @@
import org.junit.runner.RunWith;
import org.robolectric.TestRunners;
-
@RunWith(TestRunners.MultiApiSelfTest.class)
public class ShadowCornerPathEffectTest {
@Test
diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowHtmlTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowHtmlTest.java
index 6cedefb..e8afe2e 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/ShadowHtmlTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowHtmlTest.java
@@ -1,6 +1,5 @@
package org.robolectric.shadows;
-
import static android.os.Build.VERSION_CODES.M;
import static android.os.Build.VERSION_CODES.N;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowIoUtilsTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowIoUtilsTest.java
index e6b2338..2f5e0ae 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/ShadowIoUtilsTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowIoUtilsTest.java
@@ -1,6 +1,5 @@
package org.robolectric.shadows;
-
import static org.assertj.core.api.Assertions.assertThat;
import com.google.common.io.Files;
diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowMediaRecorderTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowMediaRecorderTest.java
index f46c5ac..785ce6b 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/ShadowMediaRecorderTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowMediaRecorderTest.java
@@ -1,6 +1,5 @@
package org.robolectric.shadows;
-
import static org.assertj.core.api.Assertions.assertThat;
import android.hardware.Camera;
diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowPaintTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowPaintTest.java
index 399b6d6..269cef0 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/ShadowPaintTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowPaintTest.java
@@ -12,7 +12,6 @@
import org.robolectric.TestRunners;
import org.robolectric.shadow.api.Shadow;
-
@RunWith(TestRunners.MultiApiSelfTest.class)
public class ShadowPaintTest {
diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowPathTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowPathTest.java
index 422b1d7..be0185b 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/ShadowPathTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowPathTest.java
@@ -13,7 +13,6 @@
import org.robolectric.TestRunners;
import org.robolectric.shadow.api.Shadow;
-
@RunWith(TestRunners.MultiApiSelfTest.class)
public class ShadowPathTest {
diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowSyncResultTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowSyncResultTest.java
index 025fa57..be0415a 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/ShadowSyncResultTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowSyncResultTest.java
@@ -9,7 +9,6 @@
import org.junit.runner.RunWith;
import org.robolectric.TestRunners;
-
@RunWith(TestRunners.MultiApiSelfTest.class)
public class ShadowSyncResultTest {
diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowViewConfigurationTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowViewConfigurationTest.java
index 3acf035..08a95c8 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/ShadowViewConfigurationTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowViewConfigurationTest.java
@@ -10,7 +10,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.TestRunners;
-
@RunWith(TestRunners.MultiApiSelfTest.class)
public class ShadowViewConfigurationTest {
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAccessibilityNodeInfo.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAccessibilityNodeInfo.java
index 349ad46..5f23a7a 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAccessibilityNodeInfo.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowAccessibilityNodeInfo.java
@@ -34,6 +34,7 @@
import org.robolectric.annotation.RealObject;
import org.robolectric.util.ReflectionHelpers;
import org.robolectric.util.ReflectionHelpers.ClassParameter;
+
/**
* Shadow of {@link android.view.accessibility.AccessibilityNodeInfo} that allows a test to set
* properties that are locked in the original class. It also keeps track of calls to
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowIAppOpsService.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowIAppOpsService.java
index 271c25c..d23459c 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowIAppOpsService.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowIAppOpsService.java
@@ -1,6 +1,5 @@
package org.robolectric.shadows;
-
import android.os.IBinder;
import com.android.internal.app.IAppOpsService;
import org.robolectric.annotation.Implementation;
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowIoUtils.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowIoUtils.java
index 2c1fab1..4986932 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowIoUtils.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowIoUtils.java
@@ -1,6 +1,5 @@
package org.robolectric.shadows;
-
import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.IOException;
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowVectorDrawable.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowVectorDrawable.java
index fbbd844..62074de 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowVectorDrawable.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowVectorDrawable.java
@@ -14,7 +14,6 @@
package org.robolectric.shadows;
-
import static android.os.Build.VERSION_CODES.N;
import static org.robolectric.shadows.ShadowVirtualRefBasePtr.get;
import static org.robolectric.shadows.ShadowVirtualRefBasePtr.put;