Revert r241621, "[CMake] Cleanup tools/CMakeLists.txt to take advantage of the auto...