diff --git a/ipacm/Android.bp b/ipacm/Android.bp
index 6662fce..91ad133 100644
--- a/ipacm/Android.bp
+++ b/ipacm/Android.bp
@@ -1,4 +1,3 @@
-
 package {
     // http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -16,12 +15,12 @@
     header_libs: ["device_kernel_headers"],
     cflags: ["-DFEATURE_IPA_ANDROID"] + ["-DFEATURE_IPACM_RESTART"] + [
         "-DFEATURE_IPACM_HAL",
-	"-DDEBUG",
+        "-DDEBUG",
         "-Wall",
         "-Werror",
         "-Wno-error=macro-redefined",
-	"-Wno-enum-compare",
-	"-Wno-error=implicit-fallthrough",
+        "-Wno-enum-compare",
+        "-Wno-error=implicit-fallthrough",
     ],
 
     srcs: [
@@ -49,15 +48,15 @@
     ],
 
     init_rc: ["src/ipacm.rc"],
-    clang: true,
+
     vendor: true,
 
     shared_libs: [
-	"liboffloadhal",
-	"libipanat",
-	"libxml2",
-	"libnfnetlink",
-	"libnetfilter_conntrack",
+        "liboffloadhal",
+        "libipanat",
+        "libxml2",
+        "libnfnetlink",
+        "libnetfilter_conntrack",
         "libhidlbase",
         "liblog",
         "libcutils",
diff --git a/ipanat/Android.bp b/ipanat/Android.bp
index 72ec1a8..50ca58e 100644
--- a/ipanat/Android.bp
+++ b/ipanat/Android.bp
@@ -13,15 +13,15 @@
 cc_library_shared {
     name: "libipanat",
 
-     header_libs: ["device_kernel_headers"],
+    header_libs: ["device_kernel_headers"],
 
     srcs: [
         "src/ipa_nat_drv.c",
         "src/ipa_nat_drvi.c",
     ],
 
-   shared_libs:
-        ["libcutils",
+    shared_libs: [
+        "libcutils",
         "libdl",
         "libbase",
         "libutils",
@@ -34,5 +34,4 @@
         "-Werror",
     ] + ["-DFEATURE_IPA_ANDROID"],
 
-    clang: true,
 }