am efb71f44: am 2e3746ab: am 9bcb0fcc: Merge "Recursively delete directories in handleAftermath()."

* commit 'efb71f442c6dbdb75113d29df49106217f22cea3':
  Recursively delete directories in handleAftermath().