Merge "ART: Increase stack overflow guard for sanitization" am: bfd844fe86
am: 41350defa7

Change-Id: Ie06ffaa56343740e34ef88c4cc249851d751b822