Merge "servicemanager_fuzzer: fix ODR" into main