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

Change-Id: Ic5bf0b119ac5624513e53cd8ad7ff9e85aebbb35