Merge "Don't depend on x86 valgrind" am: 3bffbe8a82
am: 3f25be2363

Change-Id: I935f558d639ada74d8f0cbddc1f971922761d7dd