Merge "Avoid JVMTI global deoptimization when possible"
am: 03bcd79437

Change-Id: I12e9af16773621ceb4abfa10cf45aee3a930f1b8