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

Change-Id: Ic29f20121d548f225675a122425068c356acfe3b