Merge "ART: Remove com.android.dex.Dex from well_known_classes." am: 3bd2346db7 am: 460841be97
am: 96dfa70718

Change-Id: I838714cb1ecdabe05685eed96c1b15bbad635cb3