Cherrypick: select and apply diffs between texts

Display diffs, allow their selection and apply approved diffs.
Return text obtained by applying only approved diffs.

Change-Id: I11b5f36b2416f3f9a9209141d9df3fab483004b8
Merge "Cherrypick: select and apply diffs between texts"