Reformat done with clang-3.5 svn200967
Fix all errors reported by cpplint.py
Fix all+1 errors reported by cpplint.py