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

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