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

Change-Id: I146d602dd82b0f285a68a282214d4917f2b95177