Merge "fixed build on x86_64" into tizen_2.1