Merge "Fix some issues for deoptimizing runtime methods."
am: cd63fc8a65

Change-Id: I220a952ea4c1333ab362ed25329b51ada631bb8d