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

Change-Id: Id74369f68440b161e4b7da610dc383e9170ea2f0