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

Change-Id: Ica9b0174bbbb6f5499ad0ef4524cbe94ce36ea99