Merge "Increase ulimit to 64MB for --no-relocate"