fix compiling

Conflicts:
	Android.mk