Merge "Add gitignore to ignore iml Intellij files." am: fe19ba361e am: 1dc7e44151
am: 6825bdb7b4

Change-Id: Id6d36fdf9744a2b6ea31487d9e0d8306dae34a6d