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

Change-Id: Ib57f9c35ddbc95646aa352ab017e8b59d9466595