issue #2905: android samples run ok
Merge pull request #3999 from minggo/iss2905-adjust_folder

issue #2905: android samples run ok