Merge "Support clinit for app image during compilation"