Merge "Ignore /.idea and *.iml files"
am: 1f1f263a8c

Change-Id: I558dc2cdd59dc9d6b5985632d29fc455aef3011c