am 25b5617c: Merge "stagefright: Fix port-reconfiguration & output-buffer-filled race condition" into jb-mr2-dev

* commit '25b5617c56488fe5413473ffae6b43f6c5bddc96':
  stagefright: Fix port-reconfiguration & output-buffer-filled race condition