Merge "Revert^4 "Hash-based dex cache type array.""
am: 1b7ba9e15d

Change-Id: I411b82c918c7bfba2a8614f9c430d7ee3928ceba