Update to the latest branch and drop the merge pull

Le Yao · lum1n0us · Le Yao · commit 843467f2c2df · 2021-04-25T05:23:19.000Z
Co-authored-by: Liang He &lt;liang.he@intel.com&gt;
Signed-off-by: Le Yao &lt;le.yao@intel.com&gt;
diff --git a/src/wamr/wamr.cc b/src/wamr/wamr.cc
@@ -30,7 +30,7 @@
 #include <vector>
 
 #include "src/wamr/types.h"
-#include "wamr/include/wasm_c_api.h"
+#include "wasm_c_api.h"
 
 namespace proxy_wasm {
 namespace wamr {
