Merge "Don't make HardwareRenderer calls in the finalizer"

core/java/android/view/RenderNode.java

@@ -909,7 +909,6 @@ public class RenderNode {
     @Override
     protected void finalize() throws Throwable {
         try {
-            destroyDisplayListData();
             nDestroyDisplayList(mNativeDisplayList);
         } finally {
             super.finalize();

core/java/android/view/ThreadedRenderer.java

@@ -253,6 +253,7 @@ public class ThreadedRenderer extends HardwareRenderer {
     protected void finalize() throws Throwable {
         try {
             nDeleteProxy(mNativeProxy);
+            mNativeProxy = 0;
         } finally {
             super.finalize();
         }