Merge "ART: Remove unused WellKnownClasses" am: 35dae4bac0
am: 694f922a97

Change-Id: I8e0461763b4f12d1b378bc3f64043246c97e6053