Merge "Fix building host valgrind for TARGET_ARCH=x86"