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

Change-Id: Id9733f682c9eba30039255099a2f2fa81e770944