Replace deprecated Android java test annotations

chrome/android/javatests/src/org/chromium/chrome/browser/util/ChromeFileProviderTest.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.util;
 
 import android.content.Context;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.ParcelFileDescriptor;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.SmallTest;
 
 import org.chromium.content.browser.test.NativeLibraryTestBase;
 
 import java.io.FileNotFoundException;
 
 /**
  * Tests working of ChromeFileProvider.
  *
  * The openFile should be blocked till notify is called. These tests can timeout if the notify does
  * not work correctly.
@@ skipping 65 matching lines @@
         // This should be unblocked when the notify is called.
         Uri file2 = ChromeFileProvider.getFileUriWhenReady(uri2);
         assertEquals(fileUri2, file2);
 
         // This should not be blocked even without a notify since file was changed.
         file1 = ChromeFileProvider.getFileUriWhenReady(uri1);
         // File should be null because the notify passes a null file uri.
         assertNull(file1);
     }
 }