Merge "Revert^2 "ART: Scope localrefs for stackoverflow handling""
am: fc7d33fc05

Change-Id: Ic6f4745ac396d88b6bc26099238b2d4e4dbe1c19