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

Conflicts:
	Android.mk
	BoardConfig.mk
	bdAddrLoader/addrloader.c
	camerawrapper/CameraWrapper.cpp
	configs/fstab.find5
	configs/init.find5.rc
	configs/init.recovery.find5.rc
	configs/snd_soc_msm_2x_Fusion3
	device.mk
	full_find5.mk
	liblight/lights.c
	overlay/frameworks/base/core/res/res/values/config.xml
	overlay/frameworks/base/core/res/res/xml/power_profile.xml

Change-Id: I76a20493b3ea0ab4eb52ab0fcd852b3c03acc58b