Update .gitignore and fix Android.mk indentation