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