update gitignore

Change-Id: I110dedcb19a3baa50afd9abfb39241725672c491
Merge "update gitignore"