Merge "Add libwvm.so"