Hygiene: Curly braces

* No empty blocks
* New line after curly brace
* Space between open curly brace and function

Change-Id: Ida67a88f2b9486be7ccc2a1ef20c1691d6e20fba
Merge "Hygiene: Curly braces"