Move MergeLogFormatter to 1.25

Follow-Up: I0557a0d2751540cf0d7967333ffd767b934011c6
Change-Id: Id18ba7d925062d795bd129af255cc902e48d30f6
Merge "Move MergeLogFormatter to 1.25"