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

Change-Id: Ib0586d718d61c70ffabc62333fd9a8a7f579e55b