am 1f64ffe2: Merge change Icb64cd2c into eclair-mr2

Merge commit '1f64ffe2e486b5a0d0c77487bdb612ee46ed7ead' into eclair-mr2-plus-aosp

* commit '1f64ffe2e486b5a0d0c77487bdb612ee46ed7ead':
  Still don't know why the heap gets corrupted, but not deleting the OMXNodeInstance appears to prevent this from happening.

media/libstagefright/omx/OMXNodeInstance.cpp

@@ -120,7 +120,8 @@ status_t OMXNodeInstance::freeNode() {
     mNodeID = NULL;
 
     LOGI("OMXNodeInstance going away.");
-    delete this;
+    mObserver.clear();
+    // delete this;  // leads to heap-corruption???
 
     return StatusFromOMXError(err);
 }