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

Change-Id: I469ab66ff7d2e600c3603664f96d97a4ee6cce06