support android build
Merge pull request #9 from webconvforge/PRbase

support android build
Merge branch 'master-upgrade'.

We were missing one android related commit on master.

Conflicts:
	sharegl.rc