Support moving conf files to /vendor/etc
am: 5348db6dda

Change-Id: I517e1f251d54a8e4a68b1cb4d6ee317c700b5e7f