Update .gitignore for android
Merge remote-tracking branch 'origin/master' into host