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

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