Merge "Fix handling of array types when extracting the offline inline caches"
am: aa44224424

Change-Id: I4cf35d3a19e55ecd0fce340ba9ff1eeebd356486