Merge "VSDK: etc snapshot may have sub_dir for relative_install_path" am: 5d5ccb43 am: 0a2fa9f5

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2583736



Change-Id: Ia9ec22fc7790eae61fbfc32e0c5c5853c46bf444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>