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

Merge commit 'cc6b941cf01994c04b5e1f92b0860be8e2abc50e'

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