b297c5a01f88219da26cffe433804963d1b70f0f

These are mostly trivial changes and are separated out just to reduce the diff on that change to the minimum possible. Note explanatory comments on patch set 1. BUG=none TEST=none Review URL: https://codereview.webrtc.org/1235643003 Cr-Commit-Position: refs/heads/master@{#9617}
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%