Merge changes I07c0f96d,I8734474f am: 5440b3663c am: a629baedb9 am: bc8a276ddd am: c10a62aa59

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2066561

Change-Id: Idc122c0e8bed9f4a5ae73a1e4535acf5b9ba4471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

confirmationui/support/Android.bp

@@ -36,7 +36,7 @@ cc_library {
     ],
     export_include_dirs: [
         "include",
-    ]
+    ],
 }
 
 cc_test {
@@ -56,6 +56,5 @@ cc_test {
         "libhidlbase",
     ],
     test_suites: ["general-tests"],
-    clang: true,
-    cflags: [ "-O0" ],
+    cflags: ["-O0"],
 }

graphics/composer/2.1/utils/hwc2on1adapter/Android.bp

@@ -25,7 +25,6 @@ cc_library_shared {
     name: "libhwc2on1adapter",
     vendor: true,
 
-    clang: true,
     cflags: [
         "-Wall",
         "-Werror",

graphics/composer/2.1/utils/hwc2onfbadapter/Android.bp

@@ -25,7 +25,6 @@ cc_library_shared {
     name: "libhwc2onfbadapter",
     vendor: true,
 
-    clang: true,
     cflags: [
         "-Wall",
         "-Wextra",
@@ -37,6 +36,9 @@ cc_library_shared {
     ],
 
     header_libs: ["libhardware_headers"],
-    shared_libs: ["liblog", "libsync"],
+    shared_libs: [
+        "liblog",
+        "libsync",
+    ],
     export_include_dirs: ["include"],
 }