fix win32 & droid build
Merge branch 'master' of github.com:sburavtsov/AnalyticX