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

Change-Id: I60bcb986c029a002ed8c8df2c4b5bcc897724519