Merge "Add build artifacts option to vndk build.sh script"