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

Change-Id: I7db9d00a2f7c4d223b05b494beeee5a566f86afc