am dfdf9453: Merge change I3085c83e into eclair-mr2

Merge commit 'dfdf9453577de9e22df3ecf9bbe3a48c2e59ccf1' into eclair-mr2-plus-aosp

* commit 'dfdf9453577de9e22df3ecf9bbe3a48c2e59ccf1':
  When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers.