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

Change-Id: I05c75903df13393149cd0c09511a8f4d6bf1fd0e