Merge "Fix mismatched free issue" into tizen_2.1