Fixing AndroidBuild to work with 'test'