android compile fixes
Merge pull request #7 from Zelex/master

android compile fixes