Merge "Revert "Disable clang for arm64 where local __thread is used.""
diff --git a/libdw/Android.mk b/libdw/Android.mk
index 5558a1a..6bb7122 100755
--- a/libdw/Android.mk
+++ b/libdw/Android.mk
@@ -172,9 +172,6 @@
 
 include $(CLEAR_VARS)
 
-# b/25642296, local __thread variable does not work with arm64 clang/llvm.
-LOCAL_CLANG_arm64 := false
-
 LOCAL_SRC_FILES := $(LIBDW_SRC_FILES)
 
 LOCAL_C_INCLUDES := \
diff --git a/libdwfl/Android.mk b/libdwfl/Android.mk
index a2c0993..eb668e2 100755
--- a/libdwfl/Android.mk
+++ b/libdwfl/Android.mk
@@ -134,9 +134,6 @@
 # Clang has no nested functions.
 LOCAL_CLANG := false
 
-# b/25642296, local __thread variable does not work with arm64 clang/llvm.
-LOCAL_CLANG_arm64 := false
-
 LOCAL_SRC_FILES := $(LIBDWFL_SRC_FILES)
 
 LOCAL_C_INCLUDES := \
diff --git a/libelf/Android.mk b/libelf/Android.mk
index 53d47be..6bc31d6 100755
--- a/libelf/Android.mk
+++ b/libelf/Android.mk
@@ -166,9 +166,6 @@
 
 include $(CLEAR_VARS)
 
-# b/25642296, local __thread variable does not work with arm64 clang/llvm.
-LOCAL_CLANG_arm64 := false
-
 LOCAL_SRC_FILES := $(LIBELF_SRC_FILES)
 
 LOCAL_C_INCLUDES := \