Apply clang-format to copytool branch files
Apply clang-format to the copytool branch files and remove last change to restrict it to top-level src dir.
Apply clang-format to the copytool branch files and remove last change to restrict it to top-level src dir.