Merge "Update vndk snapshot build script"