Merge "remove _mainline suffix from {clatd,netd}.o_mainline targets"