Merge "Don't deoptimize everything with can_access_local_variables"
am: 6b411fc9fd

Change-Id: I46a7b27edef37863b82d099910697c08802b0499