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

Change-Id: I855acad14af7bd081bd7aff079b81f274bdc0c2c