build cleanups; fix iOS artifact upload

Signed-off-by: Andrew Whitehead <[email protected]>

Author: andrewwhitehead