Merge "Revert "Reduce DexCache field/method array size to 512.""