Replace deprecated Android java test annotations

base/android/javatests/src/org/chromium/base/ApiCompatibilityUtilsTest.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.base;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.os.Build;
 import android.os.SystemClock;
+import android.support.test.filters.SmallTest;
 import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
 
 /**
  * Test of ApiCompatibilityUtils
  */
 public class ApiCompatibilityUtilsTest extends InstrumentationTestCase {
     private static final long WAIT_TIMEOUT_IN_MS = 5000;
     private static final long SLEEP_INTERVAL_IN_MS = 50;
 
     static class MockActivity extends Activity {
         int mFinishAndRemoveTaskCallbackCount;
@@ skipping 39 matching lines @@
             // after 3 tries.
             assertEquals(3, activity.mFinishAndRemoveTaskCallbackCount);
             assertEquals(1, activity.mFinishCallbackCount);
         } else {
             assertEquals(0, activity.mFinishAndRemoveTaskCallbackCount);
             assertEquals(1, activity.mFinishCallbackCount);
         }
         assertTrue(activity.mIsFinishing);
     }
 }