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

Change-Id: Ic55e875ef86b2aaf8ec24b91f9db318d18da83e4