[automerger skipped]Merge "Silence more duplicate path warnings" into pi-dev am: e57c1d03e0
-s ours
am: 3f4aa1b9aa
-s ours
Change-Id: I028031cad53855f8453514e8539f0ee89abe8950
This commit is contained in: