Merge "Support arch variations for export_system_include_dirs in cc_library_headers bp2build converter."