issue #2905: testcpp bild ok on Android
Merge pull request #3945 from minggo/iss2905-adjust_folder

issue #2905: testcpp bild ok on Android