Merge remote-tracking branch 'remotes/aosp/jb-mr1-release' into jb-4.2

Conflicts:
	BoardConfig.mk
	factory-images/generate-factory-images-package.sh
	full_maguro.mk
	overlay/frameworks/base/core/res/res/xml/power_profile.xml
	overlay/packages/apps/Mms/res/xml-mcc310-mnc260/mms_config.xml
	proprietary-blobs.txt
	self-extractors/broadcom/LICENSE
	self-extractors/broadcom/staging/device-partial.mk
	self-extractors/broadcom/staging/proprietary/Android.mk
	self-extractors/generate-packages.sh
	self-extractors/invensense/COPYRIGHT
	self-extractors/invensense/LICENSE
	self-extractors/root/BoardConfigVendor.mk
	self-extractors/root/device-vendor.mk
	self-extractors/samsung/staging/proprietary/Android.mk
	system.prop

Conflicts:

	factory-images/generate-factory-images-package.sh
	self-extractors/generate-packages.sh
fixing