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

Change-Id: Id81904dde97b0dd9c838db0c11b07100db2f25e6