Replace deprecated Android java test annotations

chrome/android/javatests/src/org/chromium/chrome/browser/OSKOverscrollTest.java

 // Copyright 2016 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.chrome.browser;
 
 import android.graphics.Rect;
+import android.support.test.filters.MediumTest;
 import android.test.MoreAsserts;
-import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.DOMUtils;
@@ skipping 137 matching lines @@
                 int priorHeight = (int) (viewportHeightBeforeCss * cssToDevicePixFactor);
                 int afterHeightPlusKeyboard =
                         (int) (viewportHeightAfterCss * cssToDevicePixFactor) + keyboardHeight;
                 updateFailureReason("Values [" + priorHeight + "], [" + afterHeightPlusKeyboard
                         + "] did not match within allowed error range [" + ERROR_EPS_PIX + "]");
                 return almostEqual(priorHeight, afterHeightPlusKeyboard);
             }
         });
     }
 }