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