Merge remote-tracking branch 'cyanogen/cm-11.0' into cm-11.0

Conflicts:
	config/common.mk
Merge remote-tracking branch 'mb52x/cm-11.0' into cm11.0-mb52x