am 31e323e6: Merge "Make sure we drain the avc software decoder\'s output queue once we run out of input data." into gingerbread

Merge commit '31e323e6c874e6f306e7f35a22350750b23b06de' into gingerbread-plus-aosp

* commit '31e323e6c874e6f306e7f35a22350750b23b06de':
  Make sure we drain the avc software decoder's output queue once we run out of input data.