Merge "Silence ulimit in run-test" am: d5482fe89a
am: 96f707ceae

Change-Id: Idec4479a5ce837371b72b9127e027a8c1a7aa0e9