Merge "Change VNDK snapshot build variant to 'user'"
am: 44e88d1411

Change-Id: I35c148c7cde1262db0fba5f7e27f4526e391f2cf