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

Change-Id: I2ea09f37b88a9eb9740b0185c54f841b6fd0e8fe