libvpx: Fix merge step for ios
libvpx: Fix merge step for ios

cee1/cerbero-mac,EricssonResearch/cerbero,ford-prefect/cerbero,BigBrother-International/gst-cerbero,ramaxlo/cerbero,fluendo/cerbero,nirbheek/cerbero-old,centricular/cerbero,superdump/cerbero,jackjansen/cerbero-2013,shoreflyer/cerbero,ramaxlo/cerbero,AlertMe/cerbero,jackjansen/cerbero,nirbheek/cerbero-old,nzjrs/cerbero,ylatuya/cerbero,GStreamer/cerbero,ylatuya/cerbero,GStreamer/cerbero,superdump/cerbero,lubosz/cerbero,freedesktop-unofficial-mirror/gstreamer__sdk__cerbero,ramaxlo/cerbero,shoreflyer/cerbero,EricssonResearch/cerbero,brion/cerbero,freedesktop-unofficial-mirror/gstreamer__sdk__cerbero,jackjansen/cerbero-2013,shoreflyer/cerbero,nzjrs/cerbero,nzjrs/cerbero,ikonst/cerbero,fluendo/cerbero,ikonst/cerbero,freedesktop-unofficial-mirror/gstreamer-sdk__cerbero,sdroege/cerbero,centricular/cerbero,superdump/cerbero,BigBrother-International/gst-cerbero,multipath-rtp/cerbero,davibe/cerbero,brion/cerbero,flexVDI/cerbero,nzjrs/cerbero,multipath-rtp/cerbero,BigBrother-International/gst-cerbero,nirbheek/cerbero,nzjrs/cerbero,AlertMe/cerbero,nirbheek/cerbero-old,jackjansen/cerbero,freedesktop-unofficial-mirror/gstreamer__sdk__cerbero,atsushieno/cerbero,lubosz/cerbero,EricssonResearch/cerbero,freedesktop-unofficial-mirror/gstreamer__sdk__cerbero,jackjansen/cerbero-2013,freedesktop-unofficial-mirror/gstreamer-sdk__cerbero,ikonst/cerbero,flexVDI/cerbero,ford-prefect/cerbero,sdroege/cerbero,centricular/cerbero,brion/cerbero,atsushieno/cerbero,AlertMe/cerbero,freedesktop-unofficial-mirror/gstreamer-sdk__cerbero,freedesktop-unofficial-mirror/gstreamer-sdk__cerbero,GStreamer/cerbero,EricssonResearch/cerbero,AlertMe/cerbero,ramaxlo/cerbero,lubosz/cerbero,superdump/cerbero,nirbheek/cerbero,ylatuya/cerbero,nirbheek/cerbero,sdroege/cerbero,cee1/cerbero-mac,atsushieno/cerbero,ford-prefect/cerbero,BigBrother-International/gst-cerbero,ramaxlo/cerbero,freedesktop-unofficial-mirror/gstreamer__cerbero,cee1/cerbero-mac,jackjansen/cerbero,OptoFidelity/cerbero,EricssonResearch/cerbero,flexVDI/cerbero,davibe/cerbero,justinjoy/cerbero,freedesktop-unofficial-mirror/gstreamer__cerbero,ikonst/cerbero,fluendo/cerbero,freedesktop-unofficial-mirror/gstreamer__cerbero,cee1/cerbero-mac,fluendo/cerbero,shoreflyer/cerbero,OptoFidelity/cerbero,centricular/cerbero,brion/cerbero,justinjoy/cerbero,nirbheek/cerbero-old,nirbheek/cerbero,ylatuya/cerbero,flexVDI/cerbero,ford-prefect/cerbero,flexVDI/cerbero,freedesktop-unofficial-mirror/gstreamer-sdk__cerbero,multipath-rtp/cerbero,GStreamer/cerbero,davibe/cerbero,sdroege/cerbero,jackjansen/cerbero-2013,sdroege/cerbero,freedesktop-unofficial-mirror/gstreamer__cerbero,multipath-rtp/cerbero,ikonst/cerbero,centricular/cerbero,jackjansen/cerbero-2013,jackjansen/cerbero,atsushieno/cerbero,OptoFidelity/cerbero,davibe/cerbero,shoreflyer/cerbero,justinjoy/cerbero,fluendo/cerbero,lubosz/cerbero,multipath-rtp/cerbero,AlertMe/cerbero,brion/cerbero,OptoFidelity/cerbero,atsushieno/cerbero,BigBrother-International/gst-cerbero,GStreamer/cerbero,justinjoy/cerbero