diff --git a/mace/python/tools/converter_tool/transformer.py b/mace/python/tools/converter_tool/transformer.py
index 2147c6e1cd28c220b01f519b7b38ff21e904fbcd..669bcf8b60ba9e2d75eed8c6052e758d6f796db9 100644
--- a/mace/python/tools/converter_tool/transformer.py
+++ b/mace/python/tools/converter_tool/transformer.py
@@ -127,7 +127,7 @@ class Transformer(base_converter.ConverterInterface):
                 self.construct_ops_and_consumers(key)
                 changed = transformer()
                 if not changed:
-                        break
+                    break
         self.delete_after_check_nodes()
         return self._model, self._quantize_activation_info
 
diff --git a/tools/arm_compiler/BUILD b/tools/arm_compiler/BUILD
index 30f83eb0a4f55815009c4d262cff634ec1516e48..140ed0d38c6a0f0a3be22daf73b959f78bb3e755 100644
--- a/tools/arm_compiler/BUILD
+++ b/tools/arm_compiler/BUILD
@@ -11,7 +11,7 @@
 filegroup(
     name = "toolchain_fg",
     srcs = [
-        ":cc-compiler-armeabi-v7a",
+        ":cc-compiler-armhf",
         ":linaro_linux_all_files",
         "@gcc_linaro_7_3_1_arm_linux_gnueabihf//:compiler_components",
     ],
@@ -29,7 +29,7 @@ cc_toolchain_suite(
     name = "toolchain",
     # target_cpu | compiler
     toolchains = {
-        "armeabi-v7a|gcc": "cc-compiler-armeabi-v7a",
+        "armhf|gcc": "cc-compiler-armhf",
     },
 )
 
@@ -66,10 +66,10 @@ filegroup(
 )
 
 cc_toolchain(
-    name = "cc-compiler-armeabi-v7a",
+    name = "cc-compiler-armhf",
     all_files = ":linaro_linux_all_files",
     compiler_files = ":linaro_linux_compiler_files",
-    cpu = "armeabi-v7a",
+    cpu = "armhf",
     dwp_files = ":empty",
     dynamic_runtime_libs = [":empty"],
     linker_files = ":linaro_linux_linker_files",
diff --git a/tools/arm_compiler/CROSSTOOL b/tools/arm_compiler/CROSSTOOL
index ce7f6d15ccc177a5fcbc0e94a56438d5ef5278cb..58edd2f976cc37f2d27fc2763647d6cab881c080 100644
--- a/tools/arm_compiler/CROSSTOOL
+++ b/tools/arm_compiler/CROSSTOOL
@@ -1,9 +1,9 @@
 major_version: "local"
 minor_version: ""
-default_target_cpu: "armeabi-v7a"
+default_target_cpu: "armhf"
 
 default_toolchain {
-  cpu: "armeabi-v7a"
+  cpu: "armhf"
   toolchain_identifier: "arm-linux-gnueabihf"
 }
 
@@ -12,7 +12,7 @@ toolchain {
   abi_libc_version: ""
   builtin_sysroot: ""
   compiler: "gcc"
-  host_system_name: "armeabi-v7a"
+  host_system_name: "armhf"
   needsPic: true
   supports_gold_linker: true
   supports_incremental_linker: false
@@ -22,7 +22,7 @@ toolchain {
   supports_start_end_lib: false
   supports_thin_archives: true
   target_libc: ""
-  target_cpu: "armeabi-v7a"
+  target_cpu: "armhf"
   target_system_name: ""
   toolchain_identifier: "arm-linux-gnueabihf"
 
diff --git a/tools/bazel.rc b/tools/bazel.rc
index 77978ea3930d3df56ab216f50c3687a05037e16d..6ad5d64ac43fc979531d88036626c189218a7b9e 100644
--- a/tools/bazel.rc
+++ b/tools/bazel.rc
@@ -27,7 +27,7 @@ build:arm_linux_gnueabihf --spawn_strategy=standalone
 build:arm_linux_gnueabihf --distinct_host_configuration=true
 build:arm_linux_gnueabihf --crosstool_top=//tools/arm_compiler:toolchain
 build:arm_linux_gnueabihf --host_crosstool_top=@bazel_tools//tools/cpp:toolchain
-build:arm_linux_gnueabihf --cpu=armeabi-v7a
+build:arm_linux_gnueabihf --cpu=armhf
 build:arm_linux_gnueabihf --copt -mfloat-abi=hard
 build:arm_linux_gnueabihf --copt -mfpu=neon
 build:arm_linux_gnueabihf --copt -Wno-ignored-attributes