Merge "Cleanup use of ulimit in run tests." am: ec024ad3b4 am: 33b7cdeb12
am: 0dad4a20a4

Change-Id: I479f9399486bb3f94457ce7e2d3bbbf9df200a94