Merge StringBase.cpp and String.cpp