Move Diff-related classes into namespace

Change-Id: If16ddd6f7b4840cb38e6f448e17cf23c3c6ea536
(cherry picked from commit 501e44238ab02cfaad8ccd9b4085d16f90629e72)
Merge "Move Diff-related classes into namespace" into wmf/1.25wmf1