Merge "Fix over-allocation of DexCache field array."