Merge pull request #6885 from hanhanW:main-to-google

PiperOrigin-RevId: 393188752
diff --git a/SUBMODULE_VERSIONS.txt b/SUBMODULE_VERSIONS.txt
index 730073b..02f8d7f 100644
--- a/SUBMODULE_VERSIONS.txt
+++ b/SUBMODULE_VERSIONS.txt
@@ -4,14 +4,14 @@
 aa533abfd4232b01f9e57041d70114d5a77e6de0 third_party/googletest
 88b845dee001723c4a0db1fe5477de735b6d3bb0 third_party/liburing
 acd6f6f014c25e46363e718381e0b35205df2d83 third_party/libyaml
-cc4bfd7f59d5a0024ada2a5c2a6f46d53290882b third_party/llvm-project
+bd7ece4e063e7afd08cbaa311878c09aadf5ec21 third_party/llvm-project
 8e030dab5908457ad11d101886c8a57dae8c9d93 third_party/mlir-hlo
 3f701faace7addc75d16dea8a6cd769fa5b3f260 third_party/musl
 4c7697dbe973ed01ae6fbec37d186ebd05982e1f third_party/pybind11
 2e1b5fb39ebc2ef4cb77005f8267e4f3a6241ba1 third_party/spirv_cross
 f5417a4b6633c3217c9a1bc2f0c70b1454975ba7 third_party/spirv_headers
 b42009b3b9d4ca35bc703f5310eedc74f584be58 third_party/stblib
-2d3420ac38db64bf38d76fe3a3d66642326b8b5f third_party/tensorflow
+0ddd755303c3b064568c08a5f0e3555c0095dfbb third_party/tensorflow
 50f7deb1a389bd3785c12fbe0be74128343f11f7 third_party/tracy
 9d10a96f2d57c3c37e167f2e73c9a31ac2e51fa5 third_party/vulkan_headers
 8d4a9e9174a9c6ad6a3a3ae981b915ef13fc12c4 third_party/vulkan_memory_allocator
diff --git a/bindings/tflite/java/org/tensorflow/lite/Interpreter.java b/bindings/tflite/java/org/tensorflow/lite/Interpreter.java
index 4500939..80c0b05 100644
--- a/bindings/tflite/java/org/tensorflow/lite/Interpreter.java
+++ b/bindings/tflite/java/org/tensorflow/lite/Interpreter.java
@@ -8,7 +8,7 @@
 
 package org.tensorflow.lite;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.util.HashMap;
diff --git a/third_party/llvm-project b/third_party/llvm-project
index cc4bfd7..bd7ece4 160000
--- a/third_party/llvm-project
+++ b/third_party/llvm-project
@@ -1 +1 @@
-Subproject commit cc4bfd7f59d5a0024ada2a5c2a6f46d53290882b
+Subproject commit bd7ece4e063e7afd08cbaa311878c09aadf5ec21
diff --git a/third_party/tensorflow b/third_party/tensorflow
index 2d3420a..0ddd755 160000
--- a/third_party/tensorflow
+++ b/third_party/tensorflow
@@ -1 +1 @@
-Subproject commit 2d3420ac38db64bf38d76fe3a3d66642326b8b5f
+Subproject commit 0ddd755303c3b064568c08a5f0e3555c0095dfbb