[automerger skipped] Use JUnit TemporaryFolder instead of *IoUtils.createTemporaryDirectory()
am: 5c3e9d65e3 -s ours
am skip reason: change_id Ia21ceb26c965dbdb6565a5a1a24142cf0cf51d7a with SHA1 c655c5fc2e is in history

Change-Id: Ic04a2763f8abd6e8c106560406b80ec633e9df73