Merge "Disable the use of inline caches in AOT mode" am: 46ef4a6f7f
am: c3c1fd694e

Change-Id: I9bf8cb79cdcd30f980771b28dee69644d9d50606