Revert^2 "Support clinit for app image during compilation"
am: 0c2c222733

Change-Id: I1bdf3637b354cc7c8bbff0aa20d0df0b9810afdb