Merge pull request #26 from ford-prefect/master

Android build system