Update gitignore

Change-Id: I8c064fbffe60c464bce2c8b1f6f307ff85e886f9
Merge "Update gitignore"