Merge "stagefright: MediaCodecSource: wait till upstream source stops on stop" into nyc-dev
am: 0d0a9e2f9f

* commit '0d0a9e2f9ffd848b484bb1805fd8162fad131303':
  stagefright: MediaCodecSource: wait till upstream source stops on stop