Merge "Fix FTBFS for x86_64" into tizen