update gitignore

Change-Id: I8d9b8c497a961711c90c295a90a38b5b8929a49c
Merge "update gitignore"