Merge "Support clinit for app image during compilation"
am: 02e3e9c457

Change-Id: Id23c5f9b6b4f25d4ff1aac9383cefc14f760bedc