Merge "[cfi] Adjust RLIMIT_AS by CFI shadow size."
am: 3e834d18e8

Change-Id: I7e9c71c8091cfa28804b11b0e2a6b7d64719393a