Android.mk: clean up noise left over from cherry-pick
Android.mk: clean up noise left over from cherry-pick && .gitignore: add '*~'