(bug 46366) Use SnakFormatter for diffs

Change-Id: I2381dd2a256ebd99bb3852a0e1d97ca38c1f0554