master back on jb-mr1-dev-aosp

for when I need to return to go

 Changes to be committed:
	modified:   device.mk
	modified:   overlay/frameworks/base/core/res/res/values/config.xml
	deleted:    overlay/frameworks/base/core/res/res/xml/eri.xml
	new file:   overlay/packages/apps/Phone/res/values/strings.xml
	modified:   recovery/Android.mk
	modified:   self-extractors/generate-packages.sh
	modified:   self-extractors/nxp/COPYRIGHT
	modified:   self-extractors/nxp/LICENSE
	modified:   self-extractors/samsung/staging/device-partial.mk
	modified:   system.prop
	modified:   vendorsetup.sh