Fix clang warnings

Reviewer: trivial

Also adds clang builds to the automerge script.