Merge "Fix finalizer ordering/double-free issue" into lmp-mr1-dev

core/java/android/view/Surface.java

@@ -604,15 +604,6 @@ public class Surface implements Parcelable {
                 mHwuiRenderer = 0;
             }
         }
-
-        @Override
-        protected void finalize() throws Throwable {
-            try {
-                destroy();
-            } finally {
-                super.finalize();
-            }
-        }
     }
 
     private static native long nHwuiCreate(long rootNode, long surface);