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

Change-Id: I9c43230b7bbbe3c4d4f85bad8c86c350c727b58c