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

Change-Id: Iea4d7e559e75656a24964990734e80e6c21f23e1