Merge "Revert "Revert "Unload oat files"""