Merge "Revert^5 "Hash-based dex cache type array.""
am: 01ea2aa05d

Change-Id: I4a26b37bfc1a94844e1c531506c98a4fcb7c0f25