Merge the emgd-1.14 branch in the sys940x-standard.scc.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>