Merge "Add build artifacts option to vndk build.sh script" am: f28baa6d2b am: 23dbf76df5

Original change: https://android-review.googlesource.com/c/platform/development/+/1335525

Change-Id: Ie986277f0f091c6cef6a3b42855eac5df9135ed6