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

Change-Id: Ied7f5f5df1171d2e27bb90a3399bc4b63bdaaca8