Also add a patch to fix the upstream compile error caused by a typo. Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>