Merge "Revert^6 "Hash-based dex cache type array.""
am: c1af10e85e

Change-Id: Ia673c7d9b2b708d3b548971fde82d570be19cea2