Merge "Allow XML file paths to be customized with sysprop" am: 931d1554c3

Change-Id: I78843e6a46efa4969e7453b7a3c9d8f7d54b0145