Merge "Change VNDK snapshot build variant to 'user'"