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

Change-Id: I5d0cc86ba797526445291635e8376b0d19fb20ba