diff --git a/compiler-rt/lib/hwasan/scripts/hwasan_symbolize b/compiler-rt/lib/hwasan/scripts/hwasan_symbolize
index 8884d77c7209a..ba11ee4ceedc4 100755
--- a/compiler-rt/lib/hwasan/scripts/hwasan_symbolize
+++ b/compiler-rt/lib/hwasan/scripts/hwasan_symbolize
@@ -263,7 +263,10 @@ class Symbolizer:
       for dname, _, fnames in os.walk(p):
         for fn in fnames:
           filename = os.path.join(dname, fn)
-          bid = get_buildid(filename)
+          try:
+            bid = get_buildid(filename)
+          except FileNotFoundError:
+            continue
           if bid is not None:
             self.__index[bid] = filename
 
diff --git a/compiler-rt/test/hwasan/TestCases/hwasan_symbolize.cpp b/compiler-rt/test/hwasan/TestCases/hwasan_symbolize.cpp
index ca2bfcb21da87..abd8bc42a34bb 100644
--- a/compiler-rt/test/hwasan/TestCases/hwasan_symbolize.cpp
+++ b/compiler-rt/test/hwasan/TestCases/hwasan_symbolize.cpp
@@ -4,8 +4,6 @@
 // RUN: %env_hwasan_opts=symbolize=0 not %run %t 2>&1 | hwasan_symbolize --html --linkify %t.linkify --symbols $(dirname %t) --index | FileCheck --check-prefixes=CHECK,LINKIFY %s
 // RUN: %env_hwasan_opts=symbolize=0 not %run %t 2>&1 | hwasan_symbolize --symbols $(dirname %t) --index | FileCheck %s
 
-// There are currently unrelated problems on x86_64, so skipping for now.
-// REQUIRES: android
 // REQUIRES: stable-runtime
 
 #include <sanitizer/hwasan_interface.h>