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

Change-Id: Id06604d69e55237a926ff2b4f9fe056ce0d0eb38