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

Change-Id: I3b54a79973437127a299a3b5633239b0415998ac