Merge "Move emulator.mk out of full_base.mk" into jb-mr2-dev