Consolidate SIMD tests. am: 6390c90291
am: be226af1a7

Change-Id: Ic6af25cf35143d8caf8fd3677b4f96b1ed76d50a