R1:a2f4d661b9a9

Fix computing line numbers in diff of diffs

Test Plan: Live in prod.

Auditors: jungejason