Merge "Fix handling of dex cache arrays for method types."