Merge "Update vndk snapshot build script" am: d6ba93f7b0
am: fffb7cc17f

Change-Id: I2a5372053ec01fd6123fd6a072d2636273f3ac85