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

Change-Id: Ic63a5c4b3eacf66c28532c0ba131c0da32a93ef0