Merge "Ignore Gradle temp files in jdiff" am: 0be98884b3 am: b0dfb93378
am: 4fd2725556

Change-Id: Ied21c54220a093eac2137ee93a56b166a54e987d