fix handle pointers
makefile android fix
Merge commit '4bcd4a2b87545169fe99516e259b52766fabbb76' into Master-makefile_dev

Conflicts:
	Makefile.android