Replace deprecated Android java test annotations

mojo/android/javatests/src/org/chromium/mojo/bindings/BindingsHelperTest.java

Index: mojo/android/javatests/src/org/chromium/mojo/bindings/BindingsHelperTest.java
diff --git a/mojo/android/javatests/src/org/chromium/mojo/bindings/BindingsHelperTest.java b/mojo/android/javatests/src/org/chromium/mojo/bindings/BindingsHelperTest.java
index a46a15773155e0727f48f93d6c39b3589d877680..38bd3482e439709e492dfb41cf0cb7001b8d4665 100644
--- a/mojo/android/javatests/src/org/chromium/mojo/bindings/BindingsHelperTest.java
+++ b/mojo/android/javatests/src/org/chromium/mojo/bindings/BindingsHelperTest.java
@@ -4,7 +4,7 @@
 
 package org.chromium.mojo.bindings;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.filters.SmallTest;
 
 import junit.framework.TestCase;
 
@@ -34,8 +34,8 @@ public class BindingsHelperTest extends TestCase {
                     BindingsHelper.utf8StringSizeInBytes(s));
         }
         assertEquals(1, BindingsHelper.utf8StringSizeInBytes("\0"));
-        String s = new StringBuilder().appendCodePoint(0x0).appendCodePoint(0x80).
-                appendCodePoint(0x800).appendCodePoint(0x10000).toString();
+        String s = new StringBuilder().appendCodePoint(0x0).appendCodePoint(0x80)
+                .appendCodePoint(0x800).appendCodePoint(0x10000).toString();
         assertEquals(10, BindingsHelper.utf8StringSizeInBytes(s));
         assertEquals(10, s.getBytes(Charset.forName("utf8")).length);
     }