Merge changes I6c0d0f92,I21bc0644

* changes:
  Follow-up commit of aosp/2367328
  Restrict DNS by UID-based network permission
diff --git a/tests/benchmarks/bpf_benchmark.cpp b/tests/benchmarks/bpf_benchmark.cpp
index 4614142..4ceefca 100644
--- a/tests/benchmarks/bpf_benchmark.cpp
+++ b/tests/benchmarks/bpf_benchmark.cpp
@@ -74,8 +74,11 @@
     }
 }
 
+namespace {
 BENCHMARK_REGISTER_F(BpfBenchMark, MapUpdateEntry)->Arg(1);
 BENCHMARK_REGISTER_F(BpfBenchMark, MapWriteNewEntry)->Arg(1);
 BENCHMARK_REGISTER_F(BpfBenchMark, MapDeleteAddEntry)->Arg(1);
 BENCHMARK_REGISTER_F(BpfBenchMark, WaitForRcu)->Arg(1);
+}  // namespace
+
 BENCHMARK_MAIN();