Merge "Fix invoke-virtual not throwing ICCE in some cases"
am: 72288c0cce

Change-Id: I50335254db0acecd41c091c137bdab07ca634e11