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

Change-Id: I75df8e89c6a7d3865651f02e1407c9a223896568