Merge "oat_file_manager: Avoid global collision check."