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

Conflicts:
	Android.mk
	BoardConfigCommon.mk
	include/private/android_filesystem_config.h
	modules/MSM8960Parts/res/raw/keypad_asanti_czech_qwerty.kcm
	modules/MSM8960Parts/res/raw/keypad_asanti_czech_qwertz.kcm
	modules/MSM8960Parts/res/raw/keypad_asanti_qwerty.kcm
	modules/MSM8960Parts/res/raw/keypad_asanti_qwertz.kcm
	msm8960.mk