Move git-merge of emgd branch out from the bsp area and into the
features area.

This change avoid getting emgd sources unnecessarily included in the
noemgd bsp kernel sources.

This addresses this bug/feature request:
[YOCTO #2268]

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>