Merge "Fix bit-rot in clean-oat targets"