Merge "fixed build error" into tizen_2.2