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

Change-Id: Ia671211c6ae17849f222013d1f72a431b85add9e