Update gitignore file

Change-Id: Ifc934ef2e5b30f600004a7a1f48dc30c6b4d2c57
Merge "Update gitignore file"