Merge "Generate VNDK snapshot zip as a build artifact" am: ca3ac0b8fc
am: 0dc14d28ae

Change-Id: I77ab22973329514bdb85a1ba90d19aa0b5670a3f