Merge "ART: Scope localrefs for stackoverflow handling"
am: 91be58aaa1

Change-Id: Ic1aacd13d465bcaeb0731ebccf965404983354d0