Merge changes from topic "refbase-lar" into main am: ea332b7 am: 7bc5c6b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3474558

Change-Id: I3229a42b0c4f2c02cdef726d9759b6f13e08bf5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Author: Steven Moreland

opengl/tools/glgen/stubs/egl/eglCreateWindowSurface.cpp

@@ -113,7 +113,7 @@ android_eglCreateWindowSurfaceTexture
     if (producer == NULL)
         goto not_valid_surface;
 
-    window = new android::Surface(producer, true);
+    window = android::sp<android::Surface>::make(producer, true);
 
     if (window == NULL)
         goto not_valid_surface;