Tidy up some build errors and reformat consistently.
Tidy up some build errors and reformat consistently.

Change-Id: I8c606bbfa3b8a4b9562193adc2c1ca22db662403

Linaro/lava-server,Linaro/lava-server,Linaro/lava-server,Linaro/lava-server