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