Removed few nonfunctional builders and slaves; some code cleaning.

git-svn-id: https://llvm.org/svn/llvm-project/zorg/trunk@205355 91177308-0d34-0410-b5e6-96231b3b80d8
Fixed indents and introduced errors.

git-svn-id: https://llvm.org/svn/llvm-project/zorg/trunk@205356 91177308-0d34-0410-b5e6-96231b3b80d8