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

Change-Id: Ie4703126fb9327804b55876e4660e63279f7bc85