v0.0.0-5018-ga3b4f4c6b

Avoid 'else' after return (clang-tidy readability-else-after-return)

(fixes 27 of our clang-tidy warnings).
While at it, fix a couple of includes.

PiperOrigin-RevId: 628510900