Merge "Merge "ART: Slightly change InitializeClass flow" into nyc-dev am: e5767666 am: 8cc6a042" into nyc-mr1-dev-plus-aosp