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

Change-Id: I2ae46bbaafcbe3b879281b7d87a69f69811116b3