Break long lines in includes/diff/

Change-Id: I778079edb147623f54f6140e11e25120b04c382e
Merge "Break long lines in includes/diff/"