Merge "Revert "Hash-based DexCache field array.""