Merge "Revert "Use frame info from CodeInfo.""
am: b8cfa92d62

Change-Id: If53a68dfc2e5aad508d9526c69c381d90689d1d9