Merge "Merge "ART: Slightly change InitializeClass flow" into nyc-dev am: e5767666 am: 8cc6a042" into nyc-mr1-dev-plus-aosp am: d39cdbf6 * commit 'd39cdbf6': Change-Id: I327dce954b3da0e5e0c32dd7e8d2d5f30dd5821c