Merge branch 'main' into OWNERS

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>

OWNERS.md

@@ -11,10 +11,10 @@ routing PRs, questions, etc. to the right place.
   * Envoy mobile core, C bridge layer, C++ extensions, build system, Envoy upstream.
 * Snow Pettersen ([snowp](https://github.com/snowp)) (aickck@gmail.com)
   * Envoy Upstream. Stats.
-* Michael Rebello ([rebello95](https://github.com/rebello95)) (mrebello@lyft.com)
-  * iOS (swift/objective-c) platform bindings.
 * Mike Schore ([goaway](https://github.com/goaway)) (mschore@lyft.com)
   * General.
+* JP Simard ([jpsim](https://github.com/jpsim)) (jp@lyft.com)
+  * iOS (swift/objective-c) platform bindings.
 * Charles Le Bornge ([carloseltuerto](http://github.com/carloseltuerto)) (cleborgne@google.com)
   * Cronvoy.
 
@@ -33,3 +33,7 @@ matter expert reviews. Feel free to loop them in as needed.
   * Cronet API shim aka "Cronvoy".
 * Keith Smiley ([keith](https://github.com/keith)) (keithbsmiley@gmail.com)
   * Bazel build magician
+
+# Emeritus maintainers
+
+* Michael Rebello ([rebello95](https://github.com/rebello95)) (mrebello@lyft.com)

bazel/envoy_mobile_repositories.bzl

@@ -69,18 +69,6 @@ def upstream_envoy_overrides():
         urls = ["https://github.com/bazelbuild/rules_python/archive/6f37aa9966f53e063c41b7509a386d53a9f156c3.tar.gz"],
     )
 
-    http_archive(
-        name = "com_github_nlohmann_json",
-        # 3.10.4 introduced incompatible changes with Envoy Mobile. Until Envoy Mobile updates it's
-        # minimum iOS version to 13+ this dependency needs to be patched.
-        patches = ["@envoy_mobile//bazel:json.patch"],
-        patch_args = ["-p1"],
-        sha256 = "1155fd1a83049767360e9a120c43c578145db3204d2b309eba49fbbedd0f4ed3",
-        strip_prefix = "json-3.10.4",
-        urls = ["https://github.com/nlohmann/json/archive/v3.10.4.tar.gz"],
-        build_file = "@envoy//bazel/external:json.BUILD",
-    )
-
 def swift_repos():
     http_archive(
         name = "build_bazel_rules_apple",
@@ -155,7 +143,7 @@ def kotlin_repos():
 def android_repos():
     http_archive(
         name = "build_bazel_rules_android",
-        urls = ["https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip"],
+        urls = ["https://github.com/bazelbuild/rules_android/archive/refs/tags/v0.1.1.zip"],
         sha256 = "cd06d15dd8bb59926e4d65f9003bfc20f9da4b2519985c27e190cddc8b7a7806",
         strip_prefix = "rules_android-0.1.1",
     )