dont_error_on_multiple_build_types.diff
usrmerge_use_both_lib_paths.diff
