fix xcode compiling error and simplify android.mk
Merge pull request #3972 from minggo/iss2905-adjust_folder

fix xcode compiling error and simplify android.mk