am 38f56613: Merge "Fix bit-rot in clean-oat targets"

* commit '38f566132408ac8bb6e69db3d72b028253159ce4':
  Fix bit-rot in clean-oat targets