Fix up build scripts for ATT and VZW