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

Change-Id: If26f80942fd9c37bc18fd6dc01cf62bf041b48fb