am 7373755a: am 013ecbfc: am 54620b1a: Merge change I6e50a8c6 into eclair

Merge commit '7373755ac391468c413f8ce4ba1f1bcc60bb1674'

* commit '7373755ac391468c413f8ce4ba1f1bcc60bb1674':
  Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."