Also, fix up some minor whitespace consistency issues, remove a little cruft, and update GOARM for armhf to 7 so that we're explicit.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: dc38061bee468ebfbfa3c89f0bb5b2edb5fd5147
Component: engine