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