Add emulator modules to PRODUCT_PACKAGES in full and sdk products

Bug: 7556265
Change-Id: Ie84f5ed6b17cccea7e6181f16686e2aac6955f1a
Add module names to emulator PRODUCT_PACKAGES.

Instead of using "LOCAL_MODULE_TAGS := debug" to install them.

Bug: 8276818
Change-Id: I7eba3c4e6c2f07ebe661522cb0e14afcc3ef7e92
bacon: name the package correctly

The variable CM_VERSION gets updated each build, but
the actual ro.cm.version in the build.prop doesn't on
incremental builds.

Name the 'bacon' package according to cm version
from the build.prop (if it exists), so that the actual
version and the name of the zip stay in sync.

Change-Id: I2dacfbbf2ae418945a9b37fef2fd7cbd31510e26
envsetup: allow using mka for mm{,m}

Change-Id: I6c0fce5e67a3b5c49023d3c00825e35b08d41845
Merge branch 'cm-10.1' of github.com:CyanogenMod/android_build into cm-10.1

Conflicts:
	core/Makefile