Merge "fix x86_64 build" into tizen