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

Change-Id: If04e823f6fab1df7b6bd9d8b935ebf17b72664a2