Merge "testutil: Merge x/ref/test/security with x/ref/test/testutil"