issue #2905:simplify Android.mk dependence
Merge pull request #3971 from minggo/iss2905-adjust_folder

issue #2905:simplify Android.mk dependence