Merge "Atest: optimize _merge_build_system_infos()"