CB-7512 Fix gradle not copying all archs to out/ (broken by prev commit)
Merge branch 'master' into 4.0.x (gradle fix)