Merge "Fix and generate vndk snapshot entirely in Soong"
am: 6e2e77336e

Change-Id: I32a3797acca1028a5019f26aa79259bd50778aa4