clang-format: apply clang-12 changes

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I9fb3265526b54f6793e717967950fb47e664a5b1