Merge "(Re)enable the use of inline caches in AOT" am: dac3f7d74d
am: 6122612389

Change-Id: I0aaa769d7b38c6b737b7c2a2f0f76009df4ed229