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