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

Change-Id: I2431100923ef8d32f9482ab2bb85c49d5f01e131