[android] Updated .gitignore patterns

* Merged Android-specific .gitignore file (cover ProjectApp, avoid redundancies)
* Added assets copied by build scripts (don't track them twice)
* Also ignore staged files

.gitignore

@@ -39,6 +39,21 @@
 /win_build/installerv2/redist/Windows/src/boinccas/*.filters
 /win_build/installerv2/redist/Windows/src/boinccas/boinccas.sdf
 
+# Android (Studio, build scripts, artefacts, redundancies)
+/android/**/*.iml
+/android/**/.gradle
+/android/**/local.properties
+/android/**/.idea
+/android/**/build
+/android/**/captures
+/android/**/.externalNativeBuild
+/stage
+/android/BOINC/app/src/main/assets/arm*
+/android/BOINC/app/src/main/assets/mips*
+/android/BOINC/app/src/main/assets/x86*
+/android/BOINC/app/src/main/assets/all_projects_list.xml
+/android/BOINC/app/src/main/assets/ca-bundle.crt
+
 ## files created by _autosetup (autoreconf):
 *.in
 *.in~
@@ -168,3 +183,6 @@ vda/ssim
 vda/vda
 vda/vdad
 /win_build/*.sdf
+
+# OS-specific files
+.DS_Store

android/BOINC/.gitignore

@@ -1,13 +0,0 @@
-app/src/main/assets/arm*
-app/src/main/assets/mips*
-app/src/main/assets/x86*
-*.iml
-.gradle
-local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-app/build
-/captures
-.externalNativeBuild
-