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