Snap for 8479861 from 10027c5c0370208538774e87781ff8c27b6b4c2a to tm-qpr1-release

Change-Id: I7ed80ba438cbe3759cf956bff7cfdd211ece927a
diff --git a/Android.bp b/Android.bp
index c113ed0..8f413c4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,8 +12,6 @@
         "-Wno-unused-parameter",
     ],
 
-    clang: true,
-
     tidy: true,
     tidy_checks: [
         "-*",
@@ -168,7 +166,7 @@
     ],
     whole_static_libs: [
         "com.android.sysprop.apex",
-        "libc++fs"
+        "libc++fs",
     ],
 }
 
@@ -209,7 +207,7 @@
                 "libarcvolume",
             ],
         },
-	},
+    },
 }
 
 cc_binary {
@@ -248,7 +246,10 @@
     name: "vold_prepare_subdirs",
     defaults: ["vold_default_flags"],
 
-    srcs: ["vold_prepare_subdirs.cpp", "Utils.cpp"],
+    srcs: [
+        "vold_prepare_subdirs.cpp",
+        "Utils.cpp",
+    ],
     shared_libs: [
         "libbase",
         "libcutils",