Merge "Fix clean-oat"