update gitignore

Change-Id: I9d837ef82dd20e72c74cf61e4e7001870ad36140
Merge "update gitignore"