Update gitignore

Change-Id: I7f2b6f3462185fba3cafd03914f1e59a914bc402
Merge "Update gitignore"