Merge commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029' into eclair-plus-aosp * commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029': Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."