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

Change-Id: I2fe0bfb0cab0832fa28c4bd8bdd6c88c1a410542