Merge "Update deopt statements in 638-checker-inline-caches"
am: 15996a3d73

Change-Id: Id50c44faea5adb7d2921ea7f502b90ea3611298e