Merge "Fix build error for common 64bit Emulator" into tizen