after language update and merging, fixed x86 build err and arm integration (#1)