diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/ContrastPixelTest.java b/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/ContrastPixelTest.java
index 8b07be1936b..50b2071bf64 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/ContrastPixelTest.java
+++ b/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/ContrastPixelTest.java
@@ -72,7 +72,6 @@ public class ContrastPixelTest {
   private @MonotonicNonNull EGLSurface placeholderEglSurface;
   private @MonotonicNonNull SingleFrameGlTextureProcessor contrastProcessor;
   private int inputTexId;
-  private int outputTexId;
   private int inputWidth;
   private int inputHeight;
 
@@ -201,7 +200,7 @@ public void drawFrame_maximumContrast_pixelEither0or255() throws Exception {
   }
 
   private void setupOutputTexture(int outputWidth, int outputHeight) throws GlUtil.GlException {
-    outputTexId =
+    int outputTexId =
         GlUtil.createTexture(
             outputWidth, outputHeight, /* useHighPrecisionColorComponents= */ false);
     int frameBuffer = GlUtil.createFboForTexture(outputTexId);
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/CropPixelTest.java b/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/CropPixelTest.java
index 09373a69ab4..7439b796b05 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/CropPixelTest.java
+++ b/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/CropPixelTest.java
@@ -65,7 +65,6 @@ public final class CropPixelTest {
   private @MonotonicNonNull SingleFrameGlTextureProcessor cropTextureProcessor;
   private @MonotonicNonNull EGLSurface placeholderEglSurface;
   private int inputTexId;
-  private int outputTexId;
   private int inputWidth;
   private int inputHeight;
 
@@ -155,7 +154,7 @@ public void drawFrame_cropLarger_producesExpectedOutput() throws Exception {
   }
 
   private void setupOutputTexture(int outputWidth, int outputHeight) throws GlUtil.GlException {
-    outputTexId =
+    int outputTexId =
         GlUtil.createTexture(
             outputWidth, outputHeight, /* useHighPrecisionColorComponents= */ false);
     int frameBuffer = GlUtil.createFboForTexture(outputTexId);
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/HslAdjustmentPixelTest.java b/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/HslAdjustmentPixelTest.java
index 11e965cca76..f08f05339e1 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/HslAdjustmentPixelTest.java
+++ b/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/HslAdjustmentPixelTest.java
@@ -77,7 +77,6 @@ public final class HslAdjustmentPixelTest {
   private @MonotonicNonNull SingleFrameGlTextureProcessor hslProcessor;
   private @MonotonicNonNull EGLSurface placeholderEglSurface;
   private int inputTexId;
-  private int outputTexId;
   private int inputWidth;
   private int inputHeight;
 
@@ -92,7 +91,7 @@ public void createGlObjects() throws IOException, GlUtil.GlException {
     GlUtil.focusEglSurface(eglDisplay, eglContext, placeholderEglSurface, inputWidth, inputHeight);
     inputTexId = createGlTextureFromBitmap(inputBitmap);
 
-    outputTexId =
+    int outputTexId =
         GlUtil.createTexture(inputWidth, inputHeight, /* useHighPrecisionColorComponents= */ false);
     int frameBuffer = GlUtil.createFboForTexture(outputTexId);
     GlUtil.focusFramebuffer(
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/MatrixTextureProcessorPixelTest.java b/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/MatrixTextureProcessorPixelTest.java
index 2b302f4ef86..53fc7cde758 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/MatrixTextureProcessorPixelTest.java
+++ b/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/MatrixTextureProcessorPixelTest.java
@@ -65,7 +65,6 @@ public final class MatrixTextureProcessorPixelTest {
   private @MonotonicNonNull EGLContext eglContext;
   private @MonotonicNonNull SingleFrameGlTextureProcessor matrixTextureProcessor;
   private int inputTexId;
-  private int outputTexId;
   private int width;
   private int height;
 
@@ -79,7 +78,8 @@ public void createGlObjects() throws IOException, GlUtil.GlException {
     EGLSurface placeholderEglSurface = GlUtil.createPlaceholderEglSurface(eglDisplay);
     GlUtil.focusEglSurface(eglDisplay, eglContext, placeholderEglSurface, width, height);
     inputTexId = createGlTextureFromBitmap(inputBitmap);
-    outputTexId = GlUtil.createTexture(width, height, /* useHighPrecisionColorComponents= */ false);
+    int outputTexId =
+        GlUtil.createTexture(width, height, /* useHighPrecisionColorComponents= */ false);
     int frameBuffer = GlUtil.createFboForTexture(outputTexId);
     GlUtil.focusFramebuffer(
         eglDisplay, eglContext, placeholderEglSurface, frameBuffer, width, height);
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/PresentationPixelTest.java b/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/PresentationPixelTest.java
index 7380216d6ef..eb048f9c201 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/PresentationPixelTest.java
+++ b/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/PresentationPixelTest.java
@@ -74,7 +74,6 @@ public final class PresentationPixelTest {
   private @MonotonicNonNull SingleFrameGlTextureProcessor presentationTextureProcessor;
   private @MonotonicNonNull EGLSurface placeholderEglSurface;
   private int inputTexId;
-  private int outputTexId;
   private int inputWidth;
   private int inputHeight;
 
@@ -263,7 +262,7 @@ public void drawFrame_changeAspectRatio_stretchToFit_wide_producesExpectedOutput
   }
 
   private void setupOutputTexture(int outputWidth, int outputHeight) throws GlUtil.GlException {
-    outputTexId =
+    int outputTexId =
         GlUtil.createTexture(
             outputWidth, outputHeight, /* useHighPrecisionColorComponents= */ false);
     int frameBuffer = GlUtil.createFboForTexture(outputTexId);
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/RgbAdjustmentPixelTest.java b/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/RgbAdjustmentPixelTest.java
index ded9e347f71..cb2bc781826 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/RgbAdjustmentPixelTest.java
+++ b/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/RgbAdjustmentPixelTest.java
@@ -71,7 +71,6 @@ public final class RgbAdjustmentPixelTest {
   private @MonotonicNonNull SingleFrameGlTextureProcessor matrixTextureProcessor;
   private @MonotonicNonNull EGLSurface placeholderEglSurface;
   private int inputTexId;
-  private int outputTexId;
   private int inputWidth;
   private int inputHeight;
 
@@ -86,7 +85,7 @@ public void createGlObjects() throws IOException, GlUtil.GlException {
     GlUtil.focusEglSurface(eglDisplay, eglContext, placeholderEglSurface, inputWidth, inputHeight);
     inputTexId = createGlTextureFromBitmap(inputBitmap);
 
-    outputTexId =
+    int outputTexId =
         GlUtil.createTexture(inputWidth, inputHeight, /* useHighPrecisionColorComponents= */ false);
     int frameBuffer = GlUtil.createFboForTexture(outputTexId);
     GlUtil.focusFramebuffer(
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/RgbFilterPixelTest.java b/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/RgbFilterPixelTest.java
index 2600f0fbb66..d8cc9dfa535 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/RgbFilterPixelTest.java
+++ b/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/RgbFilterPixelTest.java
@@ -66,7 +66,6 @@ public final class RgbFilterPixelTest {
   private @MonotonicNonNull SingleFrameGlTextureProcessor matrixTextureProcessor;
   private @MonotonicNonNull EGLSurface placeholderEglSurface;
   private int inputTexId;
-  private int outputTexId;
   private int inputWidth;
   private int inputHeight;
 
@@ -81,7 +80,7 @@ public void createGlObjects() throws IOException, GlUtil.GlException {
     GlUtil.focusEglSurface(eglDisplay, eglContext, placeholderEglSurface, inputWidth, inputHeight);
     inputTexId = createGlTextureFromBitmap(inputBitmap);
 
-    outputTexId =
+    int outputTexId =
         GlUtil.createTexture(inputWidth, inputHeight, /* useHighPrecisionColorComponents= */ false);
     int frameBuffer = GlUtil.createFboForTexture(outputTexId);
     GlUtil.focusFramebuffer(
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/SingleColorLutPixelTest.java b/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/SingleColorLutPixelTest.java
index 9cd9e5029fd..1d85e3b010a 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/SingleColorLutPixelTest.java
+++ b/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/SingleColorLutPixelTest.java
@@ -71,7 +71,6 @@ public class SingleColorLutPixelTest {
   private @MonotonicNonNull EGLSurface placeholderEglSurface;
   private @MonotonicNonNull SingleFrameGlTextureProcessor colorLutProcessor;
   private int inputTexId;
-  private int outputTexId;
   private int inputWidth;
   private int inputHeight;
 
@@ -268,7 +267,7 @@ public void drawFrame_applyGrayscaleLut_producesGrayscaleFrame() throws Exceptio
   }
 
   private void setupOutputTexture(int outputWidth, int outputHeight) throws GlUtil.GlException {
-    outputTexId =
+    int outputTexId =
         GlUtil.createTexture(
             outputWidth, outputHeight, /* useHighPrecisionColorComponents= */ false);
     int frameBuffer = GlUtil.createFboForTexture(outputTexId);