Merge "Fix building host valgrind for TARGET_ARCH=x86"
am: 2bfdd46c36

Change-Id: I7f71ca59fd1c7d74c8d293f53620eb9966a2e3f2