Merge "Revert "Work around bugprone-exception-escape bug.""
diff --git a/tools/versioner/src/Android.bp b/tools/versioner/src/Android.bp
index 97e85f8..a78ab5d 100644
--- a/tools/versioner/src/Android.bp
+++ b/tools/versioner/src/Android.bp
@@ -3,9 +3,6 @@
 
     defaults: ["llvm-build-host-tools-defaults"],
 
-    // b/117120485 bugprone-exception-escape hangs with DeclarationDatabase.cpp
-    tidy_checks: ["-bugprone-exception-escape"],
-
     srcs: [
         "versioner.cpp",
         "Arch.cpp",