diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 652fadf56..17d851b3c 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -38,10 +38,15 @@ from hashlib import sha1 as sha1
 
 class Options(object):
   def __init__(self):
-    platform_search_path = {
+    if platform.processor() == 'aarch64':
+      platform_search_path = {
+        "linux2": "out/host/linux-arm64",
+      }
+    else:
+      platform_search_path = {
         "linux2": "out/host/linux-x86",
         "darwin": "out/host/darwin-x86",
-    }
+      }
 
     self.search_path = platform_search_path.get(sys.platform, None)
     self.signapk_path = "framework/signapk.jar"  # Relative to search_path
--- /dev/null	2017-05-30 12:59:06.809484016 +0000
+++ tools/../core/clang/HOST_arm.mk	2017-06-08 16:05:39.563015342 +0000
@@ -0,0 +1 @@
+$(clang_2nd_arch_prefix)HOST_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-armv7.a
--- /dev/null	2017-05-30 12:59:06.809484016 +0000
+++ tools/../core/clang/HOST_arm64.mk	2017-06-08 16:05:39.564015311 +0000
@@ -0,0 +1 @@
+HOST_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-aarch64.a
--- /dev/null	2017-05-30 12:59:06.809484016 +0000
+++ tools/../core/combo/HOST_linux-arm.mk	2017-06-08 16:05:39.564015311 +0000
@@ -0,0 +1,30 @@
+#
+# Copyright (C) 2006 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Configuration for builds hosted on linux-arm.
+# Included by combo/select.mk
+
+define $(combo_var_prefix)transform-shared-lib-to-toc
+$(call _gen_toc_command_for_elf,$(1),$(2))
+endef
+
+############################################################
+## Macros after this line are shared by the 64-bit config.
+
+# $(1): The file to check
+define get-file-size
+stat --format "%s" "$(1)" | tr -d '\n'
+endef
--- /dev/null	2017-05-30 12:59:06.809484016 +0000
+++ tools/../core/combo/HOST_linux-arm64.mk	2017-06-08 16:05:39.564015311 +0000
@@ -0,0 +1,27 @@
+#
+# Copyright (C) 2006 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Configuration for builds hosted on linux-arm64.
+# Included by combo/select.mk
+
+define $(combo_var_prefix)transform-shared-lib-to-toc
+$(call _gen_toc_command_for_elf,$(1),$(2))
+endef
+
+# $(1): The file to check
+define get-file-size
+stat --format "%s" "$(1)" | tr -d '\n'
+endef