numpy: Build in -${CARCH} folder, rebase patches