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

Change-Id: Iba0690182ac05cc04313f91f78422efcbeb4f041