Merge "Reduce DexCache field/method array size to 512." am: 2382eaec6a
am: c314b7e244

Change-Id: I1351ec108100c3e430ca600b629a7e891b0e5938