Merged gitignore from Android Studio and GitHub
Import of the 1.6 sources.