Update and rename .gitignore~Stashed to Android.gitignore