Merge "Revert "Support clinit for app image during compilation"" am: 83c0fefa60
am: 4743103da8

Change-Id: I73db60505d2539203c221482809c1553132611c0