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

Change-Id: If629295aecf0d256027271dc3d187ee12a17f69a