(bug 41832) Use the current version of files from foreign repos.

Change-Id: I1a49ad7b7fa142bf1921afd6a2f413720e3cfcd0
Merge "(bug 41832) Use the current version of files from foreign repos."