Merge "Fix over-allocation of DexCache field array." am: 2b30e06c3c
am: d00556d9e0

Change-Id: I820465d788c6c3b3bf9371a466cad5eb6107a5bc