Merge "ART: Remove com.android.dex.Dex from well_known_classes."
am: 3bd2346db7

Change-Id: I173d27f907082316eb4707b10a073c0b37cd1d84