issue #2905:samples build ok on linux
fix conflicts
Merge pull request #3993 from minggo/iss2905-adjust_folder

Samples build ok on linux