Revert "Adapt flicker tests to perfetto-based SurfaceFlinger tracing"

This reverts commit 60b2a3adc2a1caad3ae780815df8a5dd47c5ced4.

Reason for revert: 298512106

Change-Id: I8a2e2d564022dd5e90263f0b8264ca2517f5b6a5
diff --git a/tests/SurfaceViewBufferTests/Android.bp b/tests/SurfaceViewBufferTests/Android.bp
index 38313f8..dc75f00 100644
--- a/tests/SurfaceViewBufferTests/Android.bp
+++ b/tests/SurfaceViewBufferTests/Android.bp
@@ -23,10 +23,7 @@
 
 android_test {
     name: "SurfaceViewBufferTests",
-    srcs: [
-        "**/*.java",
-        "**/*.kt",
-    ],
+    srcs: ["**/*.java","**/*.kt"],
     manifest: "AndroidManifest.xml",
     test_config: "AndroidTest.xml",
     platform_apis: true,
@@ -44,7 +41,6 @@
         "kotlin-stdlib",
         "kotlinx-coroutines-android",
         "flickerlib",
-        "flickerlib-trace_processor_shell",
         "truth-prebuilt",
         "cts-wm-util",
         "CtsSurfaceValidatorLib",
@@ -64,7 +60,7 @@
         "libandroid",
     ],
     include_dirs: [
-        "system/core/include",
+        "system/core/include"
     ],
     stl: "libc++_static",
     cflags: [