Merge "Remove unnecessary files for C++ test app."