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

Change-Id: I0bbda8fc214c0f18c71555c1e9bca79f440837de