Merge "ART: Increase stack overflow guard for x86 sanitization" am: 444d0c5b59
am: 1788a5aebb

Change-Id: I6aa8209d0274d8031f832266171d5976b7af2772