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

Change-Id: I7d4e0b1618bc54b60dc92213ed073f5a4f389e76