Merge "Revert "Hash-based DexCache field array.""
am: b9b8f153de

Change-Id: I66653591f63a9e1bc7ca192c0f309f9181e896b8