Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_device_lge_mako into HEAD

Conflicts:
	WCNSS_qcom_cfg.ini
	camera/QCameraHWI.cpp
	cm.mk
	setup-makefiles.sh
	vendor_owner_info.txt

Change-Id: I6e3999042b03d9ce20e5e70f15aba3e38e92fbb0
change brand name from google to Xiaomi

Change-Id: I68ccab5b006fb3c5de9d775e2e487f78312fa959