Merge "Do not deopt when using AOT inline caches" am: 6dd5019ccc am: 8c3d29a531 am: d577591e18
am: a65240708b

Change-Id: I1730fdab084c7bf6f2a775b2710ebe4f16fdd7f9