am c32f2eff: am acee1524: Merge "Fix clean-oat"

* commit 'c32f2eff036d94195c3243ca43527e5a7c585764':
  Fix clean-oat