Move emulator.mk out of full_base.mk

Instead we should have the emulator products (full, full_mips, full_x86,
sdk) inherit from emulator.mk directly, because full_base.mk is also
inherited by real device products, such as full_manta.mk.

Conflicts:
	target/product/full_base.mk

Change-Id: I6f5f9255c73be8a4cfad7ddf88c4b633b05a7091
signing: Support userdebug-generated display.build.id lines

Change-Id: I3ae608c12a15f6ede2150567662befa7fce763ca
Merge remote-tracking branch 'cyan/cm-11.0' into HEAD