Merge "Unload oat files"