Merge "Do not deopt when using AOT inline caches" into oc-dev
am: 4ac7516066  -s ours

Change-Id: I3f31bfc36e5b86a88489e7d7d321f9e0dd20c337