C indenter does not support common variants

Submitted by Christian Hergert `@chergert`

Builder's C indenter should support a few defaults such as

This largely depends on writing a new implementation of the C indenter. As patching what we currently have would be prohibitive.