Merge "Revert "ART: Scope localrefs for stackoverflow handling""
am: f4180000ce

Change-Id: I6ab1007adf4be039725f5e56004f921fb25cb09e