Fix specifying android output file.
Refactor tasks so they can be in thor namespaces.