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

Change-Id: Ia4104c93eed028d209be40e524bbfd8bb99e8b97