Merge "Revert^2 "Hash-based dex cache type array.""
am: 71953d82e8

Change-Id: Ia0f826bf2831afe4bda014b16ec27bf2f1db3894