Upload extra artifacts with build

(cherry picked from commit 8ffa1f665709edf4a1a0d2c7035ec6f98e09bd05)