Merge tasks for Android Nightly builds
fbc9275
`./mach upload-nightly maven` wants to upload both x86 and ARMv7