Merge "Update vndk snapshot build script"
am: d6ba93f7b0

Change-Id: I492389efb4333752619506981426e5b4b3248a52