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

Change-Id: I94c84e3fc08ec7216e11a0ccce8417d50b6f2d3b