diff --git a/mobile/android/annotations/src/main/java/org/mozilla/gecko/annotationProcessors/CodeGenerator.java b/mobile/android/annotations/src/main/java/org/mozilla/gecko/annotationProcessors/CodeGenerator.java
index 1598ecec4a4e..d39b074f5042 100644
--- a/mobile/android/annotations/src/main/java/org/mozilla/gecko/annotationProcessors/CodeGenerator.java
+++ b/mobile/android/annotations/src/main/java/org/mozilla/gecko/annotationProcessors/CodeGenerator.java
@@ -716,7 +716,7 @@ public class CodeGenerator {
     // Unpack the tuple and extract some useful fields from the Method..
     final Constructor<?> method = annotatedConstructor.getConstructor();
     final AnnotationInfo info = annotatedConstructor.mAnnotationInfo;
-    final String wrapperName = "New";
+    final String wrapperName = info.wrapperName.equals("<init>") ? "New" : info.wrapperName;
     final String uniqueName = getUniqueMethodName(wrapperName);
     final Class<?>[] argTypes = method.getParameterTypes();
     final Class<?> returnType = cls;
diff --git a/mobile/android/geckoview/build.gradle b/mobile/android/geckoview/build.gradle
index 043fab080114..9cb599d89b6d 100644
--- a/mobile/android/geckoview/build.gradle
+++ b/mobile/android/geckoview/build.gradle
@@ -511,7 +511,7 @@ task("generateSDKBindings", type: JavaExec) {
     // We only want to generate bindings for the main framework JAR,
     // but not any of the additional android.test libraries.
     args android.bootClasspath.findAll { it.getName().startsWith('android.jar') }
-    args 16
+    args 29
     args "${topobjdir}/widget/android/bindings"
 
     // Configure the arguments at evaluation-time, not at configuration-time.
diff --git a/widget/android/bindings/SurfaceTexture-classes.txt b/widget/android/bindings/SurfaceTexture-classes.txt
index 782dee0836f1..3ed577d03563 100644
--- a/widget/android/bindings/SurfaceTexture-classes.txt
+++ b/widget/android/bindings/SurfaceTexture-classes.txt
@@ -1,2 +1,5 @@
 [android.graphics.SurfaceTexture = exceptionMode:nsresult]
 [android.view.Surface = exceptionMode:nsresult]
+<init>(Landroid/view/SurfaceControl;)V = stubName:FromSurfaceControl, exceptionMode:abort
+[android.view.SurfaceControl = exceptionMode:nsresult]
+[android.view.SurfaceControl$Transaction = exceptionMode:abort]