Merge "Update gitignore." am: dfb244428a

Change-Id: I70fd5d0da6482909871bad4209c33a8e5f4cb141