Merge "Begin adding CMake support."