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

Change-Id: I9dc0676d8fc635acfeeba178e1b0b2cbcd40e160