Ignore backup files in .gitignore

Change-Id: I71af28ec8e75f321961826e2653fee9b99a87c1c
Merge "Ignore backup files in .gitignore"