Merge "Clean up RS C++ library."