Merge "Revert^2 "Use frame info from CodeInfo.""
am: 0b4a439f80

Change-Id: Iba70f0f412f3c6fddc74a318d7118bfbc2a3e17b