Merge "stagefright: rework MediaCodecSource" into nyc-dev