Revert^2 "Fix profile saver hotness for AOT code" am: f4666af9f4
am: 918a614a32

Change-Id: Ica033a1ce2a6c75955c54ba1c4cbb097e3d54f97