Merge "Update clean-oat-host after latest oat location changes."