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

* commit 'e684224201233ed35e15c3df8944bd3444984edf':
  Update clean-oat-host after latest oat location changes.