modify makefile
Merge branch 'master' of https://github.com/YixiTeam/YixiFloatWindow

Conflicts:
	Android.mk