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

Change-Id: I1d833991849919fb296a71f152a743478bf4f218