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

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

Change-Id: Ib43227b716a1cbd8f6ef85d1dc39aee660f5288a