Merge "Update gitignore." am: dfb244428a am: 5ccf17b9d5

Change-Id: I345b661685d3f5addc2d2dc0baf21f481da8fdea