Merge "ART: Configure stack guard size in the Makefile"
am: 635ba0cbce

Change-Id: I7fff2a9146dd9b17624996e77fddaad2cb7e85cc