Replace class alias Diff\DiffOp usage with original.

Bug 71295
Change-Id: I9df7dc846990a4c6561763988d1f67e1ebfda79e