am 3065a3ca: Merge change 25528 into eclair

Merge commit '3065a3cad069b847165c99a38a251c072950d07f' into eclair-plus-aosp

* commit '3065a3cad069b847165c99a38a251c072950d07f':
  Another stagefright test-case and ignore end-of-stream notifications while we're flushing.
tree: e679103590583b19c060c95deb28f3f13eb0bfa7
  1. cmds/
  2. include/
  3. media/