Merge "Install etc files with VSDK" am: 53f2c95791 am: 396449cfd3

Original change: https://android-review.googlesource.com/c/platform/development/+/1781807

Change-Id: I2c941b1fcfe29059b0035790a51083dc871b78f6