format-code: revert inadvertent changes

This partially reverts commit 2612b36b4cdeeb143b6d2cc9ef14dfc84f492ba5.

Some changes got merged in unintentionally that disabled big portions of
the format tool.  Reset those back to the previous state.

Change-Id: I47f0094ecec0ed670944736fe8f56a4084594d07
1 file changed