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