AndroidProject: Refactor to prepare for Crosswalk downloader/zip import