Merge "Tweak arguments to ld.mc"