Merge "Update clean-oat targets to handle ISA directories"