Merge "Fix build failure" into tizen