Merge "Do not deopt when using AOT inline caches" into oc-dev