Merge "Revert "Reduce DexCache field/method array size to 512.""
am: 6c11ba4d65

Change-Id: Ibd91c382cb52097c6907b87ac6e9389f42161699