Use xargs -0 instead of --null

This gives compatibility with OS X in the test.

Change-Id: I1768e7e7a76c94aaf78c0c11e07a7e60ed138664
Merge "Use xargs -0 instead of --null"