Merge "Revert^2 "Hash-based DexCache field array.""
am: 99d035fa0f

Change-Id: I0051e4d9ec16936c246891eccd104d80574142ec