Merge "tests: Clean up the temporary dirs post-run." am: b46e565fd8 am: d8e96f4b4d
am: 0d8323c4c8

Change-Id: I7ff12d00a9fe10a0aa1edd985e758e69010178fc