Merge remote-tracking branch 'remotes/google/jb-mr1-release' into ss

Conflicts:
	board-info.txt
	factory-images/generate-factory-images-package.sh
	self-extractors/generate-packages.sh

Change-Id: I9fc349c46cd75bfaa4a2a0f4e295dfebe4772e64
Change compilation branch for mr1-staging

Change-Id: I645b0cb3063ddf8b08bc984b7f4a054ded6fd271
Update maguro fingerprint

Change-Id: If6dac8a02bc7a7c0bb72dea0d75e9d89681c3219
maguro: Update build fingerprint to yakju 4.2.1

We don't bundle Wallet so yakju is closer to the truth
and what we have used in the past.

Change-Id: I51202acb2e22366dbeb6303a389ae268049643d4
Update dependencies for CM-10.1

Change-Id: I87fc7885d9ff0ff6809a43ea4fe681a288802254
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1

Conflicts:
	board-info.txt
	cm.dependencies
	self-extractors/generate-packages.sh

Change-Id: Ic0bd412c38b76ea4407984fcdba78f49dfaddc62