Fixes so that one branch builds on both android + linux.
Merge pull request #4 from glennw/android-fixes

Fixes so that one branch builds on both android + linux.