Merge "Partial revert of "Reduce using ArtMethod's dex_cache_resolved_types_.""