Merge "stagefright: MediaCodecSource: protect output format updates" into nyc-dev