2ee2439a1f41bd80fa167fb108339f2b535e30a6

Merges the two video targets since video_engine is no longer usable standalone. BUG=webrtc:1695 R=mflodman@webrtc.org, stefan@webrtc.org Review URL: https://codereview.webrtc.org/1184763009. Cr-Commit-Position: refs/heads/master@{#9479}
Revert of Fix PRESUBMIT.py after disabling CQ. (patchset #1 id:1 of https://codereview.webrtc.org/1192673003/)
Description
No description provided
Languages
C++
88.6%
C
3.3%
Java
3%
Objective-C++
1.9%
Python
1.9%
Other
1%