Merge tag 'android-5.0.0_r2' into HEAD

Android 5.0.0 release 2
sepolicy: Add permissions for wcnss_service

Our conn_init pokes the wcnss_wlan node on its own
TEMPORARY: Compensate for old blobs and incomplete featureset

- Add rules for the old rmt_storage daemon
- Use the kernel logger, kickstart hates logd
- Disable CM feature options that aren't in yet
sepolicy: Add permissions for wcnss_service

Our conn_init pokes the wcnss_wlan node on its own
TEMPORARY: Compensate for old blobs and incomplete featureset

- Add rules for the old rmt_storage daemon
- Use the kernel logger, kickstart hates logd
- Disable CM feature options that aren't in yet
Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_device_lge_mako into HEAD

Conflicts:
	BoardConfig.mk
	WCNSS_qcom_wlan_nv.bin
	apns-full-conf.xml
	device.mk
	init.mako.rc
	overlay/frameworks/base/core/res/res/values/config.xml
	proprietary-blobs.txt
	sepolicy/file_contexts

Change-Id: I6e1a6bd6110120702dd881e879f2554f7f6703ad
Merge file:///media/Data/android/cm-11.0/device/lge/mako into HEAD

Conflicts:
	BoardConfig.mk
	WCNSS_qcom_wlan_nv.bin
	device.mk
	overlay/frameworks/base/core/res/res/values/config.xml
	proprietary-blobs.txt
	rootdir/init.aries.rc

Change-Id: Idd56ac46b095f3c952f4887c874f35f67d1a49e0