Merge "Allow getrlimit/ugetrlimit syscalls in tests." am: 5da9906af0
am: 19a2b62363

Change-Id: I7207eb6b23d71d855fc48386d8ac5b595b5318ff