fix android build
Merge pull request #1235 from igorko/master

fix android build