Remove duplicated words

egrep -r '\b(\w+)\b \1 ' *xml showed a few wrongly duplicated words.

Change-Id: Ie1ec3170fce94d61d2b209bbae12279cb931b1c9
Merge "Remove duplicated words"