am 1f04c836: am 1f64ffe2: Merge change Icb64cd2c into eclair-mr2
am 1f04c836: am 1f64ffe2: Merge change Icb64cd2c into eclair-mr2

Merge commit '1f04c83684cb1a0f1e5cc6100294d6c3bbb65d4c'

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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base