Fix formatting to abide by compressed K&R style.
Merge branch 'master' of github.com:/worklist/hifi