am 2d9f3169: Merge change 5595 into donut

Merge commit '2d9f31697fb5ece89c80cc66bdd3bd9caa9df9c3'

* commit '2d9f31697fb5ece89c80cc66bdd3bd9caa9df9c3':
  We might try to close the Vorbis file twice under certain
tree: a232c85faec011b9769b5d858210a54846314e15
  1. include/
  2. media/