Merge branch 'cm-11.0' of git://github.com/daeiron/android_build.git into pac-4.4

Conflicts:
	core/Makefile
	target/product/core_base.mk
	tools/repopick.py
	tools/roomservice.py