Move diff related functions for roundtrip-test from Util module to Diff module

Change-Id: I7715617b26eecbc435b764b7b7ae0027f01d9fff
Merge "Move diff related functions for roundtrip-test from Util module to Diff module"