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

Change-Id: Ie3ec469c1c855a0ab610e97eb62cb76487c1fd30