[automerger skipped] Allow XML file paths to be customized with sysprop am:...
[automerger skipped] Allow XML file paths to be customized with sysprop am: eaac82f3 -s ours am: f6821360 -s ours
am skip reason: Change-Id I38fa2924e02363639d1cdc3dd85128e0652343ee with SHA-1 7f5e10ea is in history
Change-Id: I5ad996882661449d0c8301f1f6e10e15ce03fccc