support android build
Merge pull request #8 from webconvforge/PRcandidate

support android build
Switch from -o to --out-dir.
Revert to using -o for tests
Merge pull request #9 from kmcallister/otest

Revert to using -o for tests
Update for language changes