Merge "Only require compat mapping files if they exist."