Merge "ART: Fix Unstarted Runtime Class.forName" am: 7ebac7f39b
am: 2aa055ae0f

Change-Id: I7568a9f0aadeb426ccc3e2441d5c53cc99e96dd2