Merge "Remove another external/strace build hack."