am 9d995335: (-s ours) am 2e3746ab: am 9bcb0fcc: Merge "Recursively delete directories in handleAftermath()."

* commit '9d995335f0c8d5090ba6c774853fe261037177eb':