am acee1524: Merge "Fix clean-oat"

* commit 'acee152464725efac3dd74c9ac3acf2afa73f0e9':
  Fix clean-oat