Also fix the meta data, and add a patch from upstream to fix the compilation Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Zhai Edwin