issue #2905: helloworld build ok on android
Merge pull request #3939 from minggo/iss2905-adjust_folder

issue #2905: helloworld build ok on android