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

Change-Id: I02b761ce9728e40ea837adcd7771bbc0dd0bc606