Removed android specific imports
Merge branch 'master' of https://github.com/darryltnz/Origin