Add a space between any right bracket and left curly brace, for style.

Turns out there are a few violations of this coding convention in the code.
This patch should fix them all.

Change-Id: Ie48bd694d3ea013cf6b4b4d93c1474371fc02eeb
Merge "Add a space between any right bracket and left curly brace, for style."