Merge "Revert^4 "Allow deoptimization when returning from a runtime method.""
am: 82629c9182

Change-Id: I7f3f263e6ef7ab6eeb48e941515fa33cf1cd7eb5