fixes android build
Merge pull request #704 from baramuse/master

fixes android build