Merge "Fix build error when XLOG is enabled"