Merge "Revert^5 "Hash-based dex cache type array.""