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

Change-Id: I1b0eb14aaa78d899a7f7502a0fcb9f9088446341