Merge branch 'meticulus' into HEAD

Signed-off-by: DHOMD <DHO@dho.im>

Conflicts:
	Android.mk
	AndroidProducts.mk
	BoardConfig.mk
	BoardConfigCommon.mk
	cm.mk
	codinalte.mk
	full_codinalte.mk
	include/hardware/audio.h
	opensource/libomxil-bellagio/include/OMX_Audio.h
	opensource/libomxil-bellagio/include/OMX_Index.h
	opensource/libomxil-bellagio/include/OMX_Video.h
	opensource/lights/lights.c
	opensource/power/power.c
	overlay/frameworks/base/core/res/res/values/arrays.xml
	ril/SamsungU8500RIL.java
	rootdir/init.environ.rc
	vendorsetup.sh

Change-Id: I8953e91be05054ebd1d1849d75208f3621313ce9