fix Android build
makefile refactoring for Android
makefile refactoring
Merge pull request #163 from chrox/master

makefile refactoring for Android
Merge remote-tracking branch 'upstream/master' into android