Merge "Make SIMD checker tests more robust."
am: 89ef026f70

Change-Id: I19cbccd0e7e65f8dc727eaefc060cf48cb883c6a