Make changes for doing android dev