squisher: Fix naming of zips for devices with _ in name

Change-Id: Iac908954a435f275f606e99c4282ac4f5aacb9a3
Example: umts_spyder comes out as Gummy-M.1-02-07-14-NIGHTLY-umts.zip
overlay: fix verizon roaming indicator

Change-Id: I09308fc25496d759608628046fbc21722a7fcb72

Conflicts:
	overlay/common/frameworks/base/core/res/res/xml-mcc310-mnc003/eri.xml
	overlay/common/frameworks/base/core/res/res/xml-mcc310-mnc004/eri.xml
	overlay/common/frameworks/base/core/res/res/xml-mcc310-mnc005/eri.xml
	overlay/common/frameworks/base/core/res/res/xml-mcc310-mnc006/eri.xml
	overlay/common/frameworks/base/core/res/res/xml-mcc310-mnc012/eri.xml
	overlay/common/frameworks/base/core/res/res/xml-mcc310-mnc480/eri.xml
	overlay/common/frameworks/base/core/res/res/xml-mcc310-mnc481/eri.xml
	overlay/common/frameworks/base/core/res/res/xml-mcc310-mnc483/eri.xml
	overlay/common/frameworks/base/core/res/res/xml-mcc310-mnc486/eri.xml
	overlay/common/frameworks/base/core/res/res/xml-mcc310-mnc489/eri.xml
	overlay/common/frameworks/base/core/res/res/xml-mcc310-mnc99/eri.xml
	overlay/common/frameworks/base/core/res/res/xml-mcc311-mnc480/eri.xml
	overlay/common/frameworks/base/core/res/res/xml-mcc311-mnc482/eri.xml
	overlay/common/frameworks/base/core/res/res/xml-mcc311-mnc485/eri.xml
My changess

Signed-off-by: anerik <anerikgames@gmail.com>