Update .gitignore to better deal with .idea files. am: eecb3ef7eb am: b4f60066dd
am: cec5c925c8

Change-Id: I70bf329e791123cabf22f70cee347ef69471101e