Merge "Revert^3 "Hash-based dex cache type array.""
am: df5492c5e1

Change-Id: If1f3fe2f497a812ab5b27faf271e8baeaf056f75