Merge "Revert^6 "Hash-based dex cache type array."" am: c1af10e85e
am: 5d60aa260b

Change-Id: Iaba8166f7fae8e99bc574d64ba6ebd9b1f6481d9