Merge "libc++fs is part of libc++ now." into main

Author: enh-google

services/surfaceflinger/Android.bp

@@ -284,7 +284,6 @@ cc_defaults {
     ],
     static_libs: [
         "android.frameworks.displayservice@1.0",
-        "libc++fs",
         "libdisplayservicehidl",
         "libserviceutils",
     ],

services/surfaceflinger/fuzzer/Android.bp

@@ -28,7 +28,6 @@ package {
 cc_defaults {
     name: "surfaceflinger_fuzz_defaults",
     static_libs: [
-        "libc++fs",
         "libsurfaceflinger_common",
     ],
     srcs: [

services/surfaceflinger/tests/tracing/Android.bp

@@ -35,9 +35,6 @@ cc_test {
         ":libsurfaceflinger_mock_sources",
         "TransactionTraceTestSuite.cpp",
     ],
-    static_libs: [
-        "libc++fs",
-    ],
     header_libs: [
         "libsurfaceflinger_mocks_headers",
     ],

services/surfaceflinger/tests/unittests/Android.bp

@@ -81,7 +81,6 @@ cc_test {
         "surfaceflinger_defaults",
     ],
     test_suites: ["device-tests"],
-    static_libs: ["libc++fs"],
     header_libs: ["surfaceflinger_tests_common_headers"],
     srcs: [
         ":libsurfaceflinger_backend_mock_sources",