Merge "Revert "Support clinit for app image during compilation""