Merge "Fix and generate vndk snapshot entirely in Soong"