diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index 64708fad96..0c25f0295b 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -617,6 +617,7 @@ dist_jar("libwebrtc") {
   direct_deps_only = true
   use_unprocessed_jars = true
   requires_android = true
+  no_build_hooks = true
 
   deps = [
     ":libjingle_peerconnection_java",
diff --git a/webrtc.gni b/webrtc.gni
index f32e490f7b..f48fce7b9a 100644
--- a/webrtc.gni
+++ b/webrtc.gni
@@ -495,7 +495,6 @@ if (is_android) {
       # Treat warnings as errors.
       javac_args = [ "-Werror" ]
 
-      # TODO(sakal): Fix build hooks crbug.com/webrtc/8168
       no_build_hooks = true
     }
   }
@@ -514,7 +513,6 @@ if (is_android) {
       # Treat warnings as errors.
       javac_args = [ "-Werror" ]
 
-      # TODO(sakal): Fix build hooks crbug.com/webrtc/8168
       no_build_hooks = true
     }
   }
@@ -533,7 +531,6 @@ if (is_android) {
       # Treat warnings as errors.
       javac_args = [ "-Werror" ]
 
-      # TODO(sakal): Fix build hooks crbug.com/webrtc/8168
       no_build_hooks = true
     }
   }