Prepare for new sdk

Put webview_cts_tests behind public_android_sdk since
system_webview_apk dependency is behind public_android_sdk.

Remove override on Picture.writeToStream which has been removed.

Bug: 904912
Change-Id: Idcda7dbcb31d5bb02926e2b6743f369f988426d6
Reviewed-on: https://chromium-review.googlesource.com/c/1335955Reviewed-by: Shimi Zhang <ctzsm@chromium.org>
Commit-Queue: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608104}

android_webview/java/src/org/chromium/android_webview/AwPicture.java

@@ -68,7 +68,6 @@ class AwPicture extends Picture {
         nativeDraw(mNativeAwPicture, canvas);
     }
 
-    @Override
     @SuppressWarnings("deprecation")
     public void writeToStream(OutputStream stream) {
         unsupportedOperation();

android_webview/test/BUILD.gn

@@ -17,23 +17,26 @@ group("test") {
   ]
 }
 
-group("webview_cts_tests") {
-  _py_files = read_file("//android_webview/tools/run_cts.pydeps", "list lines")
-  deps = [
-    "//android_webview:system_webview_apk",
-  ]
+if (public_android_sdk) {
+  group("webview_cts_tests") {
+    _py_files =
+        read_file("//android_webview/tools/run_cts.pydeps", "list lines")
+    deps = [
+      "//android_webview:system_webview_apk",
+    ]
 
-  data_deps = [
-    "//build/android:logdog_wrapper_py",
-    "//build/android:test_runner_py",
-  ]
+    data_deps = [
+      "//build/android:logdog_wrapper_py",
+      "//build/android:test_runner_py",
+    ]
 
-  # Filter out comments.
-  set_sources_assignment_filter([ "#*" ])
-  sources = _py_files
+    # Filter out comments.
+    set_sources_assignment_filter([ "#*" ])
+    sources = _py_files
 
-  data = sources
-  data += [ "//android_webview/tools/cts_config/" ]
+    data = sources
+    data += [ "//android_webview/tools/cts_config/" ]
+  }
 }
 
 android_apk("webview_instrumentation_apk") {