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

Change-Id: Ia1f9a753640aea715009e288da017d4632900ff0