am a82b967e: Merge "Update clean-oat targets to handle ISA directories"

* commit 'a82b967e2f8e82f9a8cf0c02116374902b881bf4':
  Update clean-oat targets to handle ISA directories