Fixed google-diff-match-patch repo fail

Conflicts:
       default.xml

PS2: Rebase

Change-Id: I5bc8c2e0a35cbe35002a2b303e75a2ec090c63b5